Skip to content

Commit

Permalink
Merge pull request TS-Rogue-Star#279 from Very-Soft/ambulence
Browse files Browse the repository at this point in the history
Misc stuff
  • Loading branch information
Very-Soft authored May 7, 2024
2 parents 33fc0a3 + 1edea31 commit be6d546
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion code/game/jobs/job/medical_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

/datum/job/paramedic
pto_type = PTO_MEDICAL
alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder, "Search and Rescue" = /datum/alt_title/sar)
alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder, "Search and Rescue" = /datum/alt_title/sar, "Ambulance" = /datum/alt_title/ambulance)
total_positions = 3
spawn_positions = 3

Expand All @@ -92,3 +92,6 @@

/datum/alt_title/sar
title = "Search and Rescue"

/datum/alt_title/ambulance
title = "Ambulance"
2 changes: 1 addition & 1 deletion code/modules/vore/eating/vorepanel_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
return FALSE

for(var/atom/movable/target in host.vore_selected)
to_chat(target,"<span class='warning'>You're squished from [host]'s host.vore_selected to their [lowertext(choice.name)]!</span>")
to_chat(target,"<span class='warning'>You're squished from [host]'s [host.vore_selected] to their [lowertext(choice.name)]!</span>")
host.vore_selected.transfer_contents(target, choice, 1)
return TRUE
//RS ADD START
Expand Down
6 changes: 3 additions & 3 deletions maps/~map_system/funny_name.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@

/datum/map/proc/funny_name()
GLOB.special_station_name = "[pick(adj)] [pick(sub)] [pick(suf)]"
for(var/mob/living/L in player_list)
if(L.client)
L.client.update_special_station_name()
for(var/mob/M in player_list)
if(M.client)
M.client.update_special_station_name()

0 comments on commit be6d546

Please sign in to comment.