Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

emails for a future implementation of computers? maybe. #278

Closed
wants to merge 4 commits into from
Closed

emails for a future implementation of computers? maybe. #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de6c369
fuck that shit
Jun 2, 2024
2b6c465
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 2, 2024
e812797
part 1
Jun 2, 2024
edc7e52
fixes formatting issue
Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions code/datums/fluff_emails.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,57 @@
var/title //email title
var/entry_text //email content

//emails for the Golden Arrow. Implementation... soon?
/datum/fluff_email/golden_arrow

/datum/fluff_email/golden_arrow/section_a
title = "Section A shore leave???"
entry_text = {"<html>
LOG//:WEBMASTER/RETRIEVE/EMAIL
LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.'
swear to god dude this is such bs. fuckin "enhanced readiness" my ass,
transfer someone over so we're not workin with half strength platoons out here! god!
<br>
<br>
I can tell even the gunny ain't happy about this shit, the Lt's putting on a smile
but we all seen her and that friggin picture of her girlfriend she got in her wallet or whatever.
What happened to overtime pay?
<html>
"}

/datum/fluff_email/golden_arrow/section_a/reply1
title = "RE: Section A shore leave???"
entry_text = {"<html>
LOG//:WEBMASTER/RETRIEVE/EMAIL
LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.'
[...]
<br>
<br>
Okay, listen, yeah I know it's bullshit but we've got all their support gear to play with and
it's at least less fucked in the barracks if we overnight somewhere. Too many stinking bodies is
hell on earth, right?
Also. C'mon, dude. I know what you really want. You're looking at getting that bet money from Carmen
right? :)
<html>
"}

/datum/fluff_email/golden_arrow/section_a/reply2
title = "RE: RE: Section A shore leave???"
entry_text = {"<html>
LOG//:WEBMASTER/RETRIEVE/EMAIL
LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.'
[...]
<br>
<br>
[...]
we've got their support gear to play with but where'd all the ordinance go???? Lt says the
ammo supply for the M83A2s is fine, but 'new regulations' require him to store it under
the automated quartermaster's supervision??? if that's true, why're the M40s laying out??
<br>
<br>
also fuck you, i earned that shit. the spicy peanut milk fuckin sucked.
<html>
"}

//emails for the Almayer computers
/datum/fluff_email/almayer
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/structures/flora.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,15 +706,15 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
var/new_slowdown = H.next_move_slowdown + rand(4,7)
H.next_move_slowdown = new_slowdown
if(prob(10))
to_chat(H, SPAN_WARNING("It is very hard to move trough this [src]..."))
to_chat(H, SPAN_WARNING("It is very hard to move through this [src]..."))
if(8 to 9)
var/new_slowdown = H.next_move_slowdown + rand(8,11)
H.next_move_slowdown = new_slowdown
to_chat(H, SPAN_WARNING("You got tangeled in [src]!"))
to_chat(H, SPAN_WARNING("You got tangled in [src]!"))
if(10)
var/new_slowdown = H.next_move_slowdown + rand(12,20)
H.next_move_slowdown = new_slowdown
to_chat(H, SPAN_WARNING("You got completely tangeled in [src]! Oh boy..."))
to_chat(H, SPAN_WARNING("You got completely tangled in [src]! Oh boy..."))

/obj/structure/flora/jungle/thickbush/attackby(obj/item/I as obj, mob/user as mob)
//hatchets and shiet can clear away undergrowth
Expand All @@ -724,9 +724,9 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
damage = rand(8,18)
if(indestructable)
//this bush marks the edge of the map, you can't destroy it
to_chat(user, SPAN_DANGER("You flail away at the undergrowth, but it's too thick here."))
to_chat(user, SPAN_DANGER("You chop away at the undergrowth, but it's too thick here."))
else
user.visible_message(SPAN_DANGER("[user] flails away at the [src] with [I]."),SPAN_DANGER("You flail away at the [src] with [I]."))
user.visible_message(SPAN_DANGER("[user] chops away at the [src] with [I]."),SPAN_DANGER("You chop away at the [src] with [I]."))
playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1)
health -= damage
if(health < 0)
Expand Down
Loading