cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames Emergency Medical Technician to Emergency Physician to avoid "lol u not doctor". Virologists get their jumpsuit and labcoats back, yay! Fix for observers being able to observe than join a round immediately.

Browse Source
This commit is contained in:
Erthilo
2012-05-24 23:19:52 +01:00
parent 1c8b1b7c72
commit 2a3967abf3
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/medical.dm
+8 -4
View File
@@ -36,7 +36,7 @@
spawn_positions = 3
supervisors = "the chief medical officer"
selection_color = "#ffeef0"
alt_titles = list("Virologist", "Surgeon", "Emergency Medical Technician")
alt_titles = list("Virologist", "Surgeon", "Emergency Physician")
equip(var/mob/living/carbon/human/H)
@@ -45,14 +45,18 @@
if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
if(H.backbag == 4)
if(alt_titles == "Virologist")
if(H.mind.role_alt_title && H.mind.role_alt_title == "Virologist")
H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_vir(H), H.slot_back)
else
H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_med(H), H.slot_back)
H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
if(H.mind.role_alt_title && H.mind.role_alt_title == "Virologist")
H.equip_if_possible(new /obj/item/clothing/under/rank/virologist(H), H.slot_w_uniform)
H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/virologist(H), H.slot_wear_suit)
else
H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
H.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(H), H.slot_l_hand)
H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
H.equip_if_possible(new /obj/item/device/healthanalyzer(H), H.slot_r_store)
code/game/jobs/jobs.dm
+1 -1
View File
@@ -122,7 +122,7 @@ var/list/nonhuman_positions = list(
switch(job)
if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned")
return 0
if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Medical Technician", "Counselor")
if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Physician", "Counselor")
return 1
if("Quartermaster","Cargo Technician","Chemist", "Station Engineer","Roboticist", "Security Officer", "Forensic Technician","Detective", "Scientist","Shaft Miner", "Xenobiologist", "Plasma Researcher","Chief Medical Officer")
return 2
code/modules/mob/new_player/new_player.dm
+1
View File
@@ -215,6 +215,7 @@
observer.name = preferences.real_name
observer.real_name = observer.name
observer.original_name = observer.name //Original name is only used in ghost chat! It is not to be edited by anything!
observer.timeofdeath = world.time //So you can't just observe than respawn
preferences.copy_to_observer(observer)