cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

more flavor text fixes round 2 (#13126)

Browse Source 
* look at the branch name of the last pr and this one

* fix and add

* added one

* cabinet

* more

* flavor text and KEEPER AI module bugfix but why?

* \the

* real flavor text hours also secrets and an email account

* ace coder over here

* revert fun removal and fix things

* cig

* let's see if this resolves inti's remaining change

* oh hey pomf copy-pasted from mecha.dm

* this didn't commit wtf

* "whyyyyyyy", said the bauds. and nothing got done that day

* there was even another src.name

* exxion

* revert fun description removal

* whoops didn't commit vox change

* spooky
This commit is contained in:
Wizardcrying
2016-12-31 10:02:34 -08:00
committed by 9600bauds
parent bdedebe021
commit 063981f342
34 changed files with 89 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/WorkInProgress/pomf/spacepods/spacepods.dm
View File

@@ -216,15 +216,15 @@
if("pod_civ")
desc = "A sleek civilian space pod."
if("pod_black")
desc = "An all black space pod with no insignias."
desc = "A plain black space pod without any distinctive markings."
if("pod_mil")
desc = "A dark grey space pod brandishing the Nanotrasen Military insignia"
desc = "A dark grey space pod bearing the Nanotrasen military insignia."
if("pod_synd")
desc = "A menacing military space pod with Fuck NT stenciled onto the side"
desc = "A menacing military space pod with \"Fuck NT\" stenciled onto the side."
if("pod_gold")
desc = "A civilian space pod with a gold body, must have cost somebody a pretty penny"
desc = "A civilian space pod with a gold body. It must have cost somebody a pretty penny."
if("pod_industrial")
desc = "A rough looking space pod meant for industrial work"
desc = "A space pod with signs of wear on the plating. A spaceproof sticker designates it for performing industrial tasks."
/obj/spacepod/verb/toggle_internal_tank()
set name = "Toggle internal airtank usage"
@@ -332,7 +332,7 @@
inertia_dir = 0 // engage reverse thruster and power down pod
occupant.forceMove(exit_loc)
occupant = null
to_chat(usr, "<span class='notice'>You climb out of the pod</span>")
to_chat(usr, "<span class='notice'>You climb out of the pod.</span>")
/obj/spacepod/verb/move_inside()
set category = "Object"
@@ -343,7 +343,7 @@
if(occupant == usr)
move_outside(usr)
else
to_chat(usr, "<span class='notice'><B>The [src.name] is already occupied!</B></span>")
to_chat(usr, "<span class='notice'><B>\The [src] is already occupied!</B></span>")
return
if(usr.incapacitated() || usr.lying) //are you cuffed, dying, lying, stunned or other
@@ -357,17 +357,17 @@
*/
for(var/mob/living/carbon/slime/M in range(1,usr))
if(M.Victim == usr)
to_chat(usr, "You're too busy getting your life sucked out of you.")
to_chat(usr, "You're too busy getting the life sucked out of you by \the [M]!")
return
// to_chat(usr, "You start climbing into [src.name]")
visible_message("<span class='notice'>[usr] starts to climb into [src.name]</span>")
visible_message("<span class='notice'>[usr] starts to climb into \the [src].</span>")
if(enter_after(40,usr))
if(!src.occupant)
moved_inside(usr)
else if(src.occupant!=usr)
to_chat(usr, "[src.occupant] was faster. Try better next time, loser.")
to_chat(usr, "[src.occupant] was faster. Better luck next time, loser.")
else
to_chat(usr, "You stop entering the pod.")
return