Skip to content

Commit 19fde1c

Browse files
mvanalphenmvanalphen
committed
Bug fixes
1 parent 46cd4c4 commit 19fde1c

File tree

21 files changed

+12136
-12100
lines changed

21 files changed

+12136
-12100
lines changed

‎code/WorkInProgress/Mini/atmos_control.dm

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
continue
6969
if(alarm.hidden)
7070
continue
71+
if(alarm.z != z)
72+
continue
7173
var/turf/pos = get_turf(alarm)
7274
var/list/alarm_data=list()
7375
alarm_data["ID"]="\ref[alarm]"

‎code/game/area/Space Station 13 areas.dm

+8
Original file line numberDiff line numberDiff line change
@@ -1583,6 +1583,14 @@ area/security/podbay
15831583
name = "\improper Vault"
15841584
icon_state = "nuke_storage"
15851585

1586+
/area/security/customs
1587+
name = "\improper Customs"
1588+
icon_state = "checkpoint1"
1589+
1590+
/area/security/customs2
1591+
name = "\improper Customs"
1592+
icon_state = "security"
1593+
15861594
/area/security/checkpoint
15871595
name = "\improper Security Checkpoint"
15881596
icon_state = "checkpoint1"

‎code/game/jobs/job/medical.dm

+3-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
selection_color = "#ffeef0"
4949
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
5050
minimal_access = list(access_medical, access_morgue, access_surgery, access_maint_tunnels)
51-
alt_titles = list("Surgeon","Nurse","Mortician")
51+
alt_titles = list("Surgeon","Nurse","Coroner")
5252
minimal_player_age = 3
5353

5454
equip(var/mob/living/carbon/human/H)
@@ -60,10 +60,11 @@
6060
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
6161
if (H.mind.role_alt_title)
6262
switch(H.mind.role_alt_title)
63-
if("Mortician")
63+
if("Coroner")
6464
H.equip_or_collect(new /obj/item/clothing/under/rank/medical/mortician(H), slot_w_uniform)
6565
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/mortician(H), slot_wear_suit)
6666
if(H.backbag != 1)
67+
H.equip_or_collect(new /obj/item/clothing/head/surgery/black(H.back), slot_in_backpack)
6768
H.equip_or_collect(new /obj/item/weapon/autopsy_scanner(H.back), slot_in_backpack)
6869
H.equip_or_collect(new /obj/item/device/mass_spectrometer(H.back), slot_in_backpack)
6970
H.equip_or_collect(new /obj/item/weapon/storage/box/bodybags(H.back), slot_in_backpack)

‎code/game/objects/items/weapons/storage/firstaid.dm

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
name = "first-aid kit"
1313
desc = "It's an emergency medical kit for those serious boo-boos."
1414
icon_state = "firstaid"
15+
icon_override = 'icons/mob/in-hand/medkits.dmi'
1516
throw_speed = 2
1617
throw_range = 8
1718
var/empty = 0

‎code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
new /obj/item/blueprints(src)
2424
new /obj/item/clothing/under/rank/chief_engineer(src)
2525
new /obj/item/clothing/head/hardhat/white(src)
26-
new /obj/item/clothing/head/welding(src)
26+
new /obj/item/clothing/glasses/welding/superior(src)
2727
new /obj/item/clothing/gloves/yellow(src)
2828
new /obj/item/clothing/shoes/brown(src)
2929
new /obj/item/weapon/cartridge/ce(src)

‎code/game/objects/structures/window.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var/global/wcColored
1818
wcColored = 1
1919

2020
var/list/wcBarAreas = list(/area/crew_quarters/bar)
21-
var/list/wcBrigAreas = list(/area/security,/area/security/main,/area/security/lobby,/area/security/brig,/area/security/permabrig,/area/security/prison,/area/security/prison/cell_block/A,/area/security/prison/cell_block/B,/area/security/prison/cell_block/C,/area/security/execution,/area/security/processing,/area/security/interrogation,/area/security/interrogationobs,/area/security/evidence,/area/security/prisonlockers,/area/security/medbay,/area/security/processing,/area/security/warden,/area/security/armoury,/area/security/securearmoury,/area/security/armoury/gamma,/area/security/securehallway,/area/security/hos,/area/security/podbay,/area/security/detectives_office,/area/security/range,/area/security/nuke_storage,/area/security/checkpoint,/area/security/checkpoint2,/area/security/checkpoint2,/area/security/checkpoint/supply,/area/security/checkpoint/engineering,/area/security/checkpoint/medical,/area/security/checkpoint/science,/area/security/vacantoffice,/area/security/vacantoffice2,/area/prison,/area/prison/arrival_airlock,/area/prison/control,/area/prison/crew_quarters,/area/prison/rec_room,/area/prison/closet,/area/prison/hallway/fore,/area/prison/hallway/aft,/area/prison/hallway/port,/area/prison/hallway/starboard,/area/prison/morgue,/area/prison/medical_research,/area/prison/medical,/area/prison/solar,/area/prison/podbay,/area/prison/solar_control,/area/prison/solitary,/area/prison/cell_block,/area/prison/cell_block/A,/area/prison/cell_block/B,/area/prison/cell_block/C,/area/shuttle/gamma/space,/area/shuttle/gamma/station)
21+
var/list/wcBrigAreas = list(/area/security,/area/security/main,/area/security/lobby,/area/security/brig,/area/security/permabrig,/area/security/prison,/area/security/prison/cell_block/A,/area/security/prison/cell_block/B,/area/security/prison/cell_block/C,/area/security/execution,/area/security/processing,/area/security/interrogation,/area/security/interrogationobs,/area/security/evidence,/area/security/prisonlockers,/area/security/medbay,/area/security/processing,/area/security/warden,/area/security/armoury,/area/security/securearmoury,/area/security/armoury/gamma,/area/security/securehallway,/area/security/hos,/area/security/podbay,/area/security/detectives_office,/area/security/range,/area/security/nuke_storage,/area/security/customs,/area/security/customs2,/area/security/checkpoint,/area/security/checkpoint2,/area/security/checkpoint2,/area/security/checkpoint/supply,/area/security/checkpoint/engineering,/area/security/checkpoint/medical,/area/security/checkpoint/science,/area/security/vacantoffice,/area/security/vacantoffice2,/area/prison,/area/prison/arrival_airlock,/area/prison/control,/area/prison/crew_quarters,/area/prison/rec_room,/area/prison/closet,/area/prison/hallway/fore,/area/prison/hallway/aft,/area/prison/hallway/port,/area/prison/hallway/starboard,/area/prison/morgue,/area/prison/medical_research,/area/prison/medical,/area/prison/solar,/area/prison/podbay,/area/prison/solar_control,/area/prison/solitary,/area/prison/cell_block,/area/prison/cell_block/A,/area/prison/cell_block/B,/area/prison/cell_block/C,/area/shuttle/gamma/space,/area/shuttle/gamma/station)
2222

2323
var/newcolor
2424
for(var/A in wcBarAreas)

‎code/game/turfs/simulated/floor_types.dm

+8-8
Original file line numberDiff line numberDiff line change
@@ -226,17 +226,17 @@
226226
name = "snow"
227227
icon = 'icons/turf/snow.dmi'
228228
icon_state = "snow"
229-
230-
/turf/simulated/floor/plating/snow/concrete
231-
name = "concrete"
232-
icon = 'icons/turf/floors.dmi'
233-
icon_state = "concrete"
234-
235-
236-
229+
237230
/turf/simulated/floor/plating/snow/ex_act(severity)
238231
return
232+
233+
/turf/simulated/floor/snow
234+
name = "snow"
235+
icon = 'icons/turf/snow.dmi'
236+
icon_state = "snow"
239237

238+
/turf/simulated/floor/snow/ex_act(severity)
239+
return
240240

241241
/turf/simulated/shuttle/plating/vox
242242
oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON

‎code/game/turfs/unsimulated.dm

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
icon = 'icons/turf/floors.dmi'
1616
icon_state = "concrete"
1717

18-
1918
/turf/unsimulated/floor/plating/snow/ex_act(severity)
2019
return
2120

‎code/modules/clothing/head/jobs.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,5 @@
117117
icon_state = "surgcap_green"
118118

119119
/obj/item/clothing/head/surgery/black
120-
desc = "A cap morticians wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark than the mortician's humor."
120+
desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark than the mortician's humor."
121121
icon_state = "surgcap_black"

‎code/modules/clothing/suits/labcoat.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
item_state = "labcoat"
66
blood_overlay_type = "coat"
77
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
8-
allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
8+
allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper)
99
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
1010
species_fit = list("Vox")
1111
sprite_sheets = list(
@@ -132,7 +132,7 @@
132132
)
133133

134134
/obj/item/clothing/suit/storage/labcoat/mortician
135-
name = "Mortician Labcoat"
135+
name = "Coroner Labcoat"
136136
desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder."
137137
icon_state = "labcoat_mort_open"
138138
species_fit = list("Vox")

‎code/modules/clothing/under/jobs/medsci.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
)
178178

179179
/obj/item/clothing/under/rank/medical/mortician
180-
name = "mortician's scrubs"
180+
name = "coroner's scrubs"
181181
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is as dark as an emo's poetry."
182182
icon_state = "scrubsblack"
183183
_color = "scrubsblack"

‎code/modules/mob/living/carbon/human/human.dm

+3
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,9 @@
861861
if(istype(usr,/mob/living/silicon/robot))
862862
var/mob/living/silicon/robot/U = usr
863863
R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
864+
if(istype(usr,/mob/living/silicon/ai))
865+
var/mob/living/silicon/ai/U = usr
866+
R.fields[text("com_[counter]")] = text("Made by [U.name] (artificial intelligence) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
864867

865868
if (href_list["medical"])
866869
if(hasHUD(usr,"medical"))

‎code/modules/mob/living/carbon/human/human_damage.dm

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
dead_mob_list -= src
2121
respawnable_list -= src
2222
living_mob_list += src
23-
mob_list += src
2423
stat = CONSCIOUS
2524
ear_deaf = 0
2625
return

‎code/modules/mob/living/living.dm

+4
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
on_fire = 0
323323
suiciding = 0
324324
buckled = initial(src.buckled)
325+
325326
if(iscarbon(src))
326327
var/mob/living/carbon/C = src
327328
C.handcuffed = initial(C.handcuffed)
@@ -335,6 +336,9 @@
335336
if(stat == 2)
336337
dead_mob_list -= src
337338
living_mob_list += src
339+
tod = null
340+
timeofdeath = 0
341+
338342
stat = CONSCIOUS
339343
update_fire()
340344
regenerate_icons()

‎code/modules/mob/living/say.dm

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ var/list/department_radio_keys = list(
187187

188188
if(traumatic_shock > 61 && prob(50))
189189
message_mode = null //people in shock will have a high chance of not being able to speak on radio; needed since people don't instantly pass out at 100 damage.
190+
src << "<span class='warning'>You try to use your radio, but you are in too much pain.</span>"
190191

191192
message = capitalize(message)
192193

‎code/modules/mob/living/silicon/robot/drone/drone_items.dm

+2
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@
257257
stored_comms["glass"]++
258258
stored_comms["glass"]++
259259
stored_comms["glass"]++
260+
else if (istype(W,/obj/item/weapon/light/tube) || istype(W,/obj/item/weapon/light/bulb))
261+
stored_comms["glass"]++
260262
else
261263
continue
262264

‎code/modules/organs/organ_external.dm

+5-6
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@
8484

8585
if(istype(owner,/mob/living/carbon/human))
8686
var/mob/living/carbon/human/H = owner
87-
if(H.species && H.species.flags & IS_SYNTHETIC)
88-
brmod = H.species.brute_mod
89-
bumod = H.species.burn_mod
87+
if(H.species && H.species.flags & IS_SYNTHETIC) // No need for this - the modifer is being applied in the species' code already. Leaving it in, in case it ever changes.
88+
brmod = 1 //H.species.brute_mod
89+
bumod = 1 //H.species.burn_mod
9090

9191
brute *= brmod //~2/3 damage for ROBOLIMBS
9292
burn *= bumod //~2/3 damage for ROBOLIMBS
@@ -137,9 +137,8 @@
137137
burn = max(0, burn - can_inflict)
138138
//If there are still hurties to dispense
139139
if (burn || brute)
140-
if (status & ORGAN_ROBOT)
141-
if(body_part != UPPER_TORSO && body_part != LOWER_TORSO) // as below, getting hit on the chest shouldn't gib you even if you've got a robotic chest
142-
droplimb(1) //Robot limbs just kinda fail at full damage.
140+
if (status & ORGAN_ROBOT && body_part != UPPER_TORSO && body_part != LOWER_TORSO)
141+
droplimb(1) //Robot limbs just kinda fail at full damage.
143142
else
144143
//List organs we can pass it to
145144
var/list/datum/organ/external/possible_points = list()

‎code/modules/research/designs.dm

+20
Original file line numberDiff line numberDiff line change
@@ -1588,6 +1588,26 @@ datum/design/cyborg_analyzer
15881588
materials = list("$metal" = 30, "$glass" = 20)
15891589
reliability_base = 74
15901590
build_path = "/obj/item/device/robotanalyzer"
1591+
1592+
datum/design/autopsy_scanner
1593+
name = "Autopsy Scanner"
1594+
desc = "A hand-held scanner able to extracts information from wounds."
1595+
id = "autopsy_scanner"
1596+
req_tech = list("programming" = 2, "biotech" = 2, "magnets" = 2)
1597+
build_type = PROTOLATHE
1598+
materials = list("$metal" = 30, "$glass" = 20)
1599+
reliability_base = 74
1600+
build_path = "/obj/item/device/autopsy_scanner"
1601+
1602+
datum/design/detective_scanner
1603+
name = "Forensic Scanner"
1604+
desc = "A hand-held scanner able to remotely scan objects and biomass for DNA and fingerprints."
1605+
id = "detective_scanner"
1606+
req_tech = list("programming" = 4, "biotech" = 3, "magnets" = 4)
1607+
build_type = PROTOLATHE
1608+
materials = list("$metal" = 30, "$glass" = 20)
1609+
reliability_base = 74
1610+
build_path = "/obj/item/device/detective_scanner"
15911611

15921612
datum/design/mmi
15931613
name = "Man-Machine Interface"

‎data/mode.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
secret
1+
extended

‎icons/mob/in-hand/medkits.dmi

1.52 KB
Binary file not shown.

0 commit comments

Comments
 (0)