Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fixes a few bugs #14507

Merged
JamieD1 merged 1 commit into from
Jun 21, 2022
Merged

Fixes a few bugs #14507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion code/game/machinery/cryopod.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE)
R.contents -= R.mmi
qdel(R.mmi)

mob_occupant.ghostize(FALSE)
var/mob/dead/observer/ghost = mob_occupant.ghostize(FALSE)
ghost.mind = null
handle_objectives()
QDEL_NULL(occupant)
for(var/obj/item/I in get_turf(src))
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/under/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,7 @@
body_parts_covered = CHEST|GROIN
has_sensor = NO_SENSORS
can_adjust = FALSE
fitted = NO_FEMALE_UNIFORM

/obj/item/clothing/under/ash_robe/young
name = "tribal rags"
Expand Down
29 changes: 8 additions & 21 deletions code/modules/jobs/job_types/_job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,11 @@

var/uniform_skirt = null

/// Which slot the PDA defaults to
var/pda_slot = SLOT_BELT
var/alt_shoes = /obj/item/clothing/shoes/xeno_wraps // Default digitgrade shoes assignment variable
var/alt_shoes_s = /obj/item/clothing/shoes/xeno_wraps/jackboots // Digitigrade shoes for Sec assignment variable
var/alt_shoes_c = /obj/item/clothing/shoes/xeno_wraps/command // command footwraps.
var/alt_shoes_e = /obj/item/clothing/shoes/xeno_wraps/engineering // Engineering footwraps
var/alt_shoes_ca = /obj/item/clothing/shoes/xeno_wraps/cargo // Cargo Footwraps
var/alt_shoes_m = /obj/item/clothing/shoes/xeno_wraps/medical // Medical Footwraps

/// What shoes digitgrade crew should wear
var/digitigrade_shoes

/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
switch(H.backbag)
Expand All @@ -249,17 +247,9 @@

if (isplasmaman(H) && !(visualsOnly)) //this is a plasmaman fix to stop having two boxes
box = null
if(DIGITIGRADE in H.dna.species.species_traits)
if(IS_COMMAND(H)) // command gets snowflake shoes too.
shoes = alt_shoes_c
else if(IS_SECURITY(H) || find_job(H) == "Brig Physician") // Special shoes for sec and brig phys, roll first to avoid defaulting
shoes = alt_shoes_s
else if(IS_ENGINEERING(H)) // Now engineers and miners get their department specific shoes, rather than generic ones.
shoes = alt_shoes_e
else if(find_job(H) == "Shaft Miner")
shoes = alt_shoes_ca
else if(find_job(H) == "Mining Medic")
shoes = alt_shoes_m

if((DIGITIGRADE in H.dna.species.species_traits) && digitigrade_shoes)
shoes = digitigrade_shoes

/datum/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
Expand All @@ -278,10 +268,7 @@
C.assignment = H.mind.role_alt_title
else
C.assignment = J.title
if(H.mind?.assigned_role)
C.originalassignment = H.mind.assigned_role
else
C.originalassignment = J.title
C.originalassignment = J.title
if(H.age)
C.registered_age = H.age
C.update_label()
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/atmospheric_technician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

belt = /obj/item/storage/belt/utility/atmostech
ears = /obj/item/radio/headset/headset_eng
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/engineering
uniform = /obj/item/clothing/under/rank/atmospheric_technician
uniform_skirt = /obj/item/clothing/under/rank/atmospheric_technician/skirt
r_pocket = /obj/item/analyzer
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/captain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
uniform_skirt = /obj/item/clothing/under/rank/captain/skirt
suit = /obj/item/clothing/suit/armor/vest/capcarapace
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
head = /obj/item/clothing/head/caphat
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/station_charter=1, /obj/item/gun/energy/e_gun=1, /obj/item/modular_computer/tablet/phone/preset/advanced/command=1) //yogs - adds egun/removes civ budget

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chief_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
uniform = /obj/item/clothing/under/rank/chief_engineer
uniform_skirt = /obj/item/clothing/under/rank/chief_engineer/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
alt_shoes = /obj/item/clothing/shoes/xeno_wraps/command // Provides Command shoes to digitigrade species
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
head = /obj/item/clothing/head/hardhat/white
gloves = /obj/item/clothing/gloves/color/black/ce
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/phone/preset/advanced/command/atmos=1) //yogs - removes eng budget
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chief_medical_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
uniform = /obj/item/clothing/under/rank/chief_medical_officer
uniform_skirt = /obj/item/clothing/under/rank/chief_medical_officer/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
alt_shoes = /obj/item/clothing/shoes/xeno_wraps/command // Provides Command shoes to digitigrade species
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
suit = /obj/item/clothing/suit/toggle/labcoat/cmo
l_hand = /obj/item/storage/firstaid/medical
suit_store = /obj/item/flashlight/pen/paramedic
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/detective.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
uniform_skirt = /obj/item/clothing/under/rank/det/skirt
neck = /obj/item/clothing/neck/tie/detective
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
suit = /obj/item/clothing/suit/det_suit
gloves = /obj/item/clothing/gloves/color/black/forensic
head = /obj/item/clothing/head/fedora/det_hat
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/head_of_personnel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
uniform = /obj/item/clothing/under/rank/head_of_personnel
uniform_skirt = /obj/item/clothing/under/rank/head_of_personnel/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
head = /obj/item/clothing/head/hopcap
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/phone/preset/advanced/command=1) //yogs - removes serv budget
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/head_of_security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
uniform = /obj/item/clothing/under/rank/head_of_security
uniform_skirt = /obj/item/clothing/under/rank/head_of_security/skirt
shoes = /obj/item/clothing/shoes/jackboots
alt_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots // Provides Command shoes to digitigrade species
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
suit = /obj/item/clothing/suit/armor/hos/trenchcoat
gloves = /obj/item/clothing/gloves/color/black/hos
head = /obj/item/clothing/head/HoS/beret
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/research_director.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
uniform = /obj/item/clothing/under/rank/research_director
uniform_skirt = /obj/item/clothing/under/rank/research_director/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
alt_shoes = /obj/item/clothing/shoes/xeno_wraps/command // Provides Command shoes to digitigrade species
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
suit = /obj/item/clothing/suit/toggle/labcoat
l_hand = /obj/item/clipboard
l_pocket = /obj/item/laser_pointer
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/security_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ GLOBAL_LIST_INIT(available_depts_sec, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICA
head = /obj/item/clothing/head/helmet/sec
suit = /obj/item/clothing/suit/armor/vest/alt
shoes = /obj/item/clothing/shoes/jackboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld
suit_store = /obj/item/gun/energy/disabler
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/shaft_miner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

ears = /obj/item/radio/headset/headset_cargo/mining
shoes = /obj/item/clothing/shoes/workboots/mining
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/cargo
gloves = /obj/item/clothing/gloves/color/black
uniform = /obj/item/clothing/under/rank/miner/lavaland
neck = /obj/item/clothing/neck/bodycam/miner
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/station_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ GLOBAL_LIST_INIT(available_depts_eng, list(ENG_DEPT_MEDICAL, ENG_DEPT_SCIENCE, E
uniform = /obj/item/clothing/under/rank/engineer
uniform_skirt = /obj/item/clothing/under/rank/engineer/skirt
shoes = /obj/item/clothing/shoes/workboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/engineering
head = /obj/item/clothing/head/hardhat
r_pocket = /obj/item/t_scanner

Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/warden.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
uniform = /obj/item/clothing/under/rank/warden
uniform_skirt = /obj/item/clothing/under/rank/warden/skirt
shoes = /obj/item/clothing/shoes/jackboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
suit = /obj/item/clothing/suit/armor/vest/warden/alt
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/warden
Expand Down
4 changes: 3 additions & 1 deletion code/modules/mob/mob_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,9 @@
var/mob/dead/observer/C = pick(candidates)
to_chat(M, "Your mob has been taken over by a ghost!")
message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(M)])")
M.ghostize(0)
var/mob/dead/observer/G = M.ghostize(FALSE)
if(istype(G))
G.mind = null
M.key = C.key
return TRUE
else
Expand Down
1 change: 1 addition & 0 deletions code/modules/reagents/reagent_containers/syringes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@

/obj/item/reagent_containers/syringe/on_embed(mob/living/carbon/human/embedde, obj/item/bodypart/part)
reagents.trans_to(embedde, amount_per_transfer_from_this)
return TRUE

/obj/item/reagent_containers/syringe/embed_tick(embedde, part)
reagents.trans_to(embedde, amount_per_transfer_from_this * 0.2)
Expand Down
1 change: 1 addition & 0 deletions yogstation/code/modules/jobs/job_types/brig_physician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
ears = /obj/item/radio/headset/headset_medsec
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
shoes = /obj/item/clothing/shoes/jackboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
uniform = /obj/item/clothing/under/yogs/rank/miner/medic
suit = /obj/item/clothing/suit/toggle/labcoat/emt/physician
l_hand = /obj/item/storage/firstaid/regular
Expand Down
1 change: 1 addition & 0 deletions yogstation/code/modules/jobs/job_types/mining_medic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
ears = /obj/item/radio/headset/headset_medcargo
glasses = /obj/item/clothing/glasses/hud/health/meson
shoes = /obj/item/clothing/shoes/workboots/mining
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/medical
suit = /obj/item/clothing/suit/toggle/labcoat/emt/explorer
uniform = /obj/item/clothing/under/yogs/rank/miner/medic
l_hand = /obj/item/storage/firstaid/regular
Expand Down
1 change: 1 addition & 0 deletions yogstation/code/modules/jobs/job_types/network_admin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
suit = /obj/item/clothing/suit/hooded/wintercoat/engineering/tcomms
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/workboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/engineering
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)

backpack = /obj/item/storage/backpack/industrial
Expand Down