From 7cac6b57b9796de28a788cc2c7060b1e1ba1e3b3 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Wed, 17 Jun 2015 10:30:43 +0200 Subject: [PATCH 01/16] Restores the missing vault camera. Fixes #9842. --- maps/exodus-1.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index ab78257f9b..53b1dbd23b 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -1525,7 +1525,7 @@ "aDq" = (/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/bar) "aDr" = (/obj/item/weapon/stool{pixel_y = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor,/area/storage/primary) "aDs" = (/turf/simulated/wall,/area/maintenance/bar) -"aDt" = (/obj/structure/closet/crate,/obj/item/stack/material/gold,/obj/item/weapon/storage/belt/champion,/turf/simulated/floor{icon_state = "vault"; dir = 1},/area/security/nuke_storage) +"aDt" = (/obj/structure/closet/crate,/obj/item/stack/material/gold,/obj/item/weapon/storage/belt/champion,/obj/machinery/camera/network/command{c_tag = "Vault"; dir = 4},/turf/simulated/floor{icon_state = "vault"; dir = 1},/area/security/nuke_storage) "aDu" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Civilian East"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/substation/civilian_east) "aDv" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Civilian East Substation Bypass"},/turf/simulated/floor/plating,/area/maintenance/substation/civilian_east) "aDw" = (/obj/structure/cable/green,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor/plating,/area/maintenance/substation/civilian_east) From 1ba777f670c1b8549fdfbdcd1bd93f6851b5349b Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Tue, 16 Jun 2015 16:41:22 -0400 Subject: [PATCH 02/16] Reverses stunrevolver buff --- code/modules/projectiles/guns/energy/stun.dm | 2 +- code/modules/projectiles/projectile/energy.dm | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index cc40169fb5..d5cf32efb3 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -25,7 +25,7 @@ item_state = "stunrevolver" fire_sound = 'sound/weapons/Gunshot.ogg' origin_tech = "combat=3;materials=3;powerstorage=2" - projectile_type = /obj/item/projectile/energy/electrode/stunshot + projectile_type = /obj/item/projectile/energy/electrode max_shots = 8 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 2a114e9067..063acf750b 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -44,11 +44,6 @@ name = "electrode" icon_state = "spark" nodamage = 1 - /* - stun = 10 - weaken = 10 - stutter = 10 - */ taser_effect = 1 agony = 40 damage_type = HALLOSS From b26edd690ce13458a08097a3180e1ac7efe29cbc Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Tue, 16 Jun 2015 16:53:25 -0400 Subject: [PATCH 03/16] Certain sidearms now use the lighter gunshot sound --- .../living/simple_animal/hostile/syndicate.dm | 2 +- .../projectiles/guns/projectile/automatic.dm | 6 +++--- .../projectiles/guns/projectile/pistol.dm | 3 +++ .../projectiles/guns/projectile/revolver.dm | 1 + .../{Gunshot_smg.ogg => Gunshot_light.ogg} | Bin sound/weapons/gunshot_smg2.ogg | Bin 14838 -> 0 bytes 6 files changed, 8 insertions(+), 4 deletions(-) rename sound/weapons/{Gunshot_smg.ogg => Gunshot_light.ogg} (100%) delete mode 100644 sound/weapons/gunshot_smg2.ogg diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 870ad82c8e..fa742733a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -108,7 +108,7 @@ icon_state = "syndicateranged" icon_living = "syndicateranged" casingtype = /obj/item/ammo_casing/a12mm - projectilesound = 'sound/weapons/Gunshot_smg.ogg' + projectilesound = 'sound/weapons/Gunshot_light.ogg' projectiletype = /obj/item/projectile/bullet/pistol/medium weapon1 = /obj/item/weapon/gun/projectile/automatic/c20r diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 2ad17537c2..106f8a0ea4 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -38,7 +38,7 @@ caliber = "12mm" origin_tech = "combat=5;materials=2;syndicate=8" slot_flags = SLOT_BELT|SLOT_BACK - fire_sound = 'sound/weapons/Gunshot_smg.ogg' + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/a12mm auto_eject = 1 @@ -86,7 +86,7 @@ origin_tech = "combat=5;materials=2" slot_flags = SLOT_BELT ammo_type = "/obj/item/ammo_casing/c9mmr" - fire_sound = 'sound/weapons/Gunshot_smg.ogg' + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/mc9mmt/rubber @@ -182,7 +182,7 @@ origin_tech = "combat=6;materials=1;syndicate=2" slot_flags = SLOT_BACK ammo_type = "/obj/item/ammo_casing/a762" - fire_sound = 'sound/weapons/Gunshot_smg.ogg' + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/a762 diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 2c116901ec..d054f4eff8 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -5,6 +5,7 @@ icon_state = "colt" caliber = ".45" origin_tech = "combat=2;materials=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE /obj/item/weapon/gun/projectile/colt/detective @@ -36,6 +37,7 @@ magazine_type = /obj/item/ammo_magazine/c45m/rubber caliber = ".45" origin_tech = "combat=2;materials=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE /obj/item/weapon/gun/projectile/sec/flash @@ -112,6 +114,7 @@ caliber = "9mm" silenced = 0 origin_tech = "combat=2;materials=2;syndicate=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/mc9mm diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index cb17710773..1f83533ce8 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -22,6 +22,7 @@ max_shells = 6 caliber = "38" origin_tech = "combat=2;materials=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' ammo_type = /obj/item/ammo_casing/c38 /obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun() diff --git a/sound/weapons/Gunshot_smg.ogg b/sound/weapons/Gunshot_light.ogg similarity index 100% rename from sound/weapons/Gunshot_smg.ogg rename to sound/weapons/Gunshot_light.ogg diff --git a/sound/weapons/gunshot_smg2.ogg b/sound/weapons/gunshot_smg2.ogg deleted file mode 100644 index faba955f525cce3365f9e4e1bdf3eb7ab122e716..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14838 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 Date: Thu, 18 Jun 2015 12:53:20 -0400 Subject: [PATCH 04/16] Adjusts animate_tail_once duration --- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 382ff909b3..6ce3e76d8b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -926,7 +926,7 @@ var/global/list/damage_icon_parts = list() tail_overlay = set_tail_state(t_state) if(tail_overlay) - spawn(15) + spawn(20) //check that the animation hasn't changed in the meantime if(overlays_standing[TAIL_LAYER] == tail_overlay && tail_overlay.icon_state == t_state) animate_tail_stop() From 44644d34b46fedd9638f7477ecd78074f979edaa Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Thu, 18 Jun 2015 12:55:31 -0400 Subject: [PATCH 05/16] Restores stop drop and roll time Returns the duration of stop drop and roll to 3 seconds. The amount of removed fire stacks was reduced by ~3/5 instead of lengthening the time. --- code/modules/mob/living/carbon/resist.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index c99a8bd599..56272f654e 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -3,14 +3,14 @@ //drop && roll if(on_fire) - fire_stacks -= 2 - Weaken(5) - spin(52,2) + fire_stacks -= 1.2 + Weaken(3) + spin(32,2) visible_message( "[src] rolls on the floor, trying to put themselves out!", "You stop, drop, and roll!" ) - sleep(50) + sleep(30) if(fire_stacks <= 0) visible_message( "[src] has successfully extinguished themselves!", From ccb12556d6b47475abca6a5f7201d889e386079f Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Thu, 18 Jun 2015 16:31:29 -0400 Subject: [PATCH 06/16] Fixes #9624 --- code/modules/mob/living/carbon/resist.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index 95ee36b1f6..5620a701a0 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -19,12 +19,12 @@ ExtinguishMob() return + ..() + if(handcuffed) spawn() escape_handcuffs() else if(legcuffed) spawn() escape_legcuffs() - - ..() /mob/living/carbon/proc/escape_handcuffs() if(!(last_special <= world.time)) return From 9b29ae64d9f25eddb5cad26d1e48d8334488a4cb Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Thu, 18 Jun 2015 13:20:00 -0400 Subject: [PATCH 07/16] Allows walls with matching base icons to merge --- code/game/turfs/simulated/wall_icon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/wall_icon.dm b/code/game/turfs/simulated/wall_icon.dm index 1adaba850f..fa6ee92855 100644 --- a/code/game/turfs/simulated/wall_icon.dm +++ b/code/game/turfs/simulated/wall_icon.dm @@ -129,6 +129,6 @@ return /turf/simulated/wall/proc/can_join_with(var/turf/simulated/wall/W) - if(material && W.material && material.name == W.material.name) + if(material && W.material && material.icon_base == W.material.icon_base) return 1 return 0 \ No newline at end of file From 7d710f201933a21f79ffff9b2a84f399ed359c8e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 20 Jun 2015 21:54:22 +0930 Subject: [PATCH 08/16] Fixes #8471 --- code/modules/clothing/suits/storage.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index 221a8dbd29..8b9c4613e6 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -76,12 +76,12 @@ if(icon_state == icon_badge) icon_state = icon_nobadge - usr << "You unclip the badge from the vest." + usr << "You conceal \the [src]'s badge." else if(icon_state == icon_nobadge) icon_state = icon_badge - usr << "You clip the badge to the vest." + usr << "You reveal \the [src]'s badge." else - usr << "You can't find a badge for [src]." + usr << "\The [src] does not have a vest badge." return update_clothing_icon() From e13c4a22436ff6ff50fb36087aed3dd30144e44d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 20 Jun 2015 21:57:03 +0930 Subject: [PATCH 09/16] Fixes #7828 --- code/modules/mob/living/carbon/alien/alien.dm | 1 + code/modules/mob/living/carbon/alien/death.dm | 2 +- code/modules/mob/living/carbon/alien/diona/diona.dm | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 7bf1842b0f..891483b71a 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -15,6 +15,7 @@ var/max_grown = 200 var/time_of_birth var/language + var/death_msg = "lets out a waning guttural screech, green blood bubbling from its maw." /mob/living/carbon/alien/New() diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm index 3c56165213..87990ae756 100644 --- a/code/modules/mob/living/carbon/alien/death.dm +++ b/code/modules/mob/living/carbon/alien/death.dm @@ -1,4 +1,4 @@ /mob/living/carbon/alien/death(gibbed) if(!gibbed && dead_icon) icon_state = dead_icon - return ..(gibbed,"lets out a waning guttural screech, green blood bubbling from its maw.") \ No newline at end of file + return ..(gibbed,death_msg) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm index 981e250749..86dc101eda 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona.dm @@ -5,7 +5,7 @@ speak_emote = list("chirrups") icon_state = "nymph" language = "Rootspeak" - + death_msg = "expires with a pitiful chirrup..." universal_understand = 1 universal_speak = 0 // Dionaea do not need to speak to people other than other dionaea. holder_type = /obj/item/weapon/holder/diona From c8c35acf3ab0aa8c5c2829874a5c5fff603569c2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 20 Jun 2015 22:12:38 +0930 Subject: [PATCH 10/16] Fixes #9785 --- code/game/objects/items/weapons/traps.dm | 25 +++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index f6af73843c..d62b89f3fa 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -20,20 +20,20 @@ /obj/item/weapon/beartrap/attack_self(mob/user as mob) ..() - if(deployed && can_use(user)) + if(!deployed && can_use(user)) user.visible_message( - "[user] starts to deploy \the [src].", - "You begin deploying \the [src]!", + "[user] starts to deploy \the [src].", + "You begin deploying \the [src]!", "You hear the slow creaking of a spring." ) - + if (do_after(user, 60)) user.visible_message( - "[user] has deployed \the [src].", + "[user] has deployed \the [src].", "You have deployed \the [src]!", "You hear a latch click loudly." ) - + deployed = 1 user.drop_from_inventory(src) update_icon() @@ -42,7 +42,7 @@ /obj/item/weapon/beartrap/attack_hand(mob/user as mob) if(buckled_mob && can_use(user)) user.visible_message( - "[user] begins freeing [buckled_mob] from \the [src].", + "[user] begins freeing [buckled_mob] from \the [src].", "You carefully begin to free [buckled_mob] from \the [src].", ) if(do_after(user, 60)) @@ -51,13 +51,13 @@ anchored = 0 else if(deployed && can_use(user)) user.visible_message( - "[user] starts to disarm \the [src].", + "[user] starts to disarm \the [src].", "You begin disarming \the [src]!", "You hear a latch click followed by the slow creaking of a spring." ) if(do_after(user, 60)) user.visible_message( - "[user] has disarmed \the [src].", + "[user] has disarmed \the [src].", "You have disarmed \the [src]!" ) deployed = 0 @@ -86,15 +86,18 @@ //trap the victim in place if(!blocked) set_dir(L.dir) + can_buckle = 1 buckle_mob(L) L << "The steel jaws of \the [src] bite into you, trapping you in place!" + deployed = 0 + can_buckle = initial(can_buckle) /obj/item/weapon/beartrap/Crossed(AM as mob|obj) - if(isliving(AM)) + if(deployed && isliving(AM)) var/mob/living/L = AM if(L.m_intent == "run") L.visible_message( - "[L] steps on \the [src].", + "[L] steps on \the [src].", "You step on \the [src]!", "You hear a loud metallic snap!" ) From 56b68b9abee3b233ccce80619e5765cfe6ca273d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 20 Jun 2015 22:15:38 +0930 Subject: [PATCH 11/16] Fixes #9847 --- code/game/machinery/holosign.dm | 1 + code/modules/economy/Accounts_DB.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index e51025aee2..6319871022 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -8,6 +8,7 @@ use_power = 1 idle_power_usage = 2 active_power_usage = 4 + anchored = 1 var/lit = 0 var/id = null var/on_icon = "sign_on" diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index d60a6b542d..20278d0757 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -6,6 +6,7 @@ icon_state = "aiupload" density = 1 req_one_access = list(access_hop, access_captain, access_cent_captain) + anchored = 1 var/receipt_num var/machine_id = "" var/obj/item/weapon/card/id/held_card From 7d9378748d0837053657762817e93aca12eeae24 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 20 Jun 2015 22:48:08 +0930 Subject: [PATCH 12/16] Comments out fire and rads for material objects since they are very imbalanced atm. --- .../weapons/material/material_weapons.dm | 22 ++++++++++++------- .../objects/items/weapons/material/shards.dm | 1 + code/modules/materials/materials.dm | 3 +++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 6ff156b27f..c396f8d4b9 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -17,6 +17,7 @@ var/thrown_force_divisor = 0.5 var/default_material = DEFAULT_WALL_MATERIAL var/material/material + var/drops_debris = 1 /obj/item/weapon/material/New(var/newloc, var/material_key) ..(newloc) @@ -70,33 +71,37 @@ health-- check_health() -/obj/item/weapon/material/proc/check_health() +/obj/item/weapon/material/proc/check_health(var/consumed) if(health<=0) - shatter() + shatter(consumed) -/obj/item/weapon/material/proc/shatter() +/obj/item/weapon/material/proc/shatter(var/consumed) var/turf/T = get_turf(src) T.visible_message("\The [src] [material.destruction_desc]!") if(istype(loc, /mob/living)) var/mob/living/M = loc M.drop_from_inventory(src) playsound(src, "shatter", 70, 1) - material.place_shard(T) + if(!consumed && drops_debris) material.place_shard(T) qdel(src) - +/* +Commenting this out pending rebalancing of radiation based on small objects. /obj/item/weapon/material/process() if(!material.radioactivity) return for(var/mob/living/L in range(1,src)) - L.apply_effect(round(material.radioactivity/3),IRRADIATE,0) + L.apply_effect(round(material.radioactivity/30),IRRADIATE,0) +*/ +/* +// Commenting this out while fires are so spectacularly lethal, as I can't seem to get this balanced appropriately. /obj/item/weapon/material/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) TemperatureAct(exposed_temperature) // This might need adjustment. Will work that out later. /obj/item/weapon/material/proc/TemperatureAct(temperature) health -= material.combustion_effect(get_turf(src), temperature, 0.1) - check_health() + check_health(1) /obj/item/weapon/material/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/weldingtool)) @@ -104,4 +109,5 @@ if(material.ignition_point && WT.remove_fuel(0, user)) TemperatureAct(150) else - return ..() \ No newline at end of file + return ..() +*/ \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 6c2eb7ced3..fa39ce719e 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -14,6 +14,7 @@ attack_verb = list("stabbed", "slashed", "sliced", "cut") default_material = "glass" unbreakable = 1 //It's already broken. + drops_debris = 0 /obj/item/weapon/material/shard/suicide_act(mob/user) viewers(user) << pick("\red [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", \ diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index b5ace0d5d5..2098c7c776 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -257,6 +257,8 @@ var/list/name_to_material stack_origin_tech = "phorontech=2;materials=2" door_icon_base = "stone" +/* +// Commenting this out while fires are so spectacularly lethal, as I can't seem to get this balanced appropriately. /material/phoron/combustion_effect(var/turf/T, var/temperature, var/effect_multiplier) if(isnull(ignition_point)) return 0 @@ -270,6 +272,7 @@ var/list/name_to_material spawn (0) target_tile.hotspot_expose(temperature, 400) return round(totalPhoron/100) +*/ /material/stone name = "sandstone" From 89d6e529a7e310d732a29f16053c415b6a5f8bf2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 20 Jun 2015 23:14:09 +0930 Subject: [PATCH 13/16] Compile fix. --- code/game/objects/items/weapons/material/ashtray.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm index 033042b853..d5e7cd67bb 100644 --- a/code/game/objects/items/weapons/material/ashtray.dm +++ b/code/game/objects/items/weapons/material/ashtray.dm @@ -62,8 +62,8 @@ var/global/list/ashtray_cache = list() cig.transfer_fingerprints_to(butt) qdel(cig) W = butt - spawn(1) - TemperatureAct(150) + //spawn(1) + // TemperatureAct(150) else if (cig.lit == 0) user << "You place [cig] in [src] without even smoking it. Why would you do that?" From 12507e68727c520529d7bcc8846ca937d62f6f93 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 21 Jun 2015 01:13:41 +0930 Subject: [PATCH 14/16] Fixes #9866 --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 9b62a14ef4..5f98aa83ba 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -22,6 +22,7 @@ /obj/structure/bed/New(var/newloc, var/new_material, var/new_padding_material) ..(newloc) + color = null if(!new_material) new_material = DEFAULT_WALL_MATERIAL material = get_material_by_name(new_material) From 7c1696c3c8226caf3b72ffc2698f2e0f4b93c5a7 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 21 Jun 2015 01:27:23 +0930 Subject: [PATCH 15/16] Fixes #9435 --- code/modules/mob/living/carbon/human/species/outsider/shadow.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm index 41349846eb..dd614bb55b 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm @@ -18,7 +18,7 @@ remains_type = /obj/effect/decal/cleanable/ash death_message = "dissolves into ash..." - flags = IS_RESTRICTED | NO_BLOOD | NO_POISON | NO_SCAN | NO_SLIP | NO_POISON + flags = IS_RESTRICTED | NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON /datum/species/shadow/handle_death(var/mob/living/carbon/human/H) spawn(1) From 6fff0069db87a4d8b51714370e224f00435dee3b Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 21 Jun 2015 01:48:15 +0930 Subject: [PATCH 16/16] Fixes # #8327 --- .../mob/living/carbon/human/human_defense.dm | 22 +++++++++---------- code/modules/mob/living/carbon/human/life.dm | 6 ++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index b2f3e17745..29832ae1ec 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -446,19 +446,19 @@ emp_act var/penetrated_dam = max(0,(damage - SS.breach_threshold)) if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam) -/mob/living/human/reagent_permeability() +/mob/living/carbon/human/reagent_permeability() var/perm = 0 - + var/list/perm_by_part = list( - "head" = THERMAL_PROTECTION_HEAD, - "upper_torso" = THERMAL_PROTECTION_UPPER_TORSO, - "lower_torso" = THERMAL_PROTECTION_LOWER_TORSO, - "legs" = THERMAL_PROTECTION_LEG_LEFT + THERMAL_PROTECTION_LEG_RIGHT, - "feet" = THERMAL_PROTECTION_FOOT_LEFT + THERMAL_PROTECTION_FOOT_RIGHT, - "arms" = THERMAL_PROTECTION_ARM_LEFT + THERMAL_PROTECTION_ARM_RIGHT, + "head" = THERMAL_PROTECTION_HEAD, + "upper_torso" = THERMAL_PROTECTION_UPPER_TORSO, + "lower_torso" = THERMAL_PROTECTION_LOWER_TORSO, + "legs" = THERMAL_PROTECTION_LEG_LEFT + THERMAL_PROTECTION_LEG_RIGHT, + "feet" = THERMAL_PROTECTION_FOOT_LEFT + THERMAL_PROTECTION_FOOT_RIGHT, + "arms" = THERMAL_PROTECTION_ARM_LEFT + THERMAL_PROTECTION_ARM_RIGHT, "hands" = THERMAL_PROTECTION_HAND_LEFT + THERMAL_PROTECTION_HAND_RIGHT ) - + for(var/obj/item/clothing/C in src.get_equipped_items()) if(C.permeability_coefficient == 1 || !C.body_parts_covered) continue @@ -476,9 +476,9 @@ emp_act perm_by_part["arms"] *= C.permeability_coefficient if(C.body_parts_covered & HANDS) perm_by_part["hands"] *= C.permeability_coefficient - + for(var/part in perm_by_part) perm += perm_by_part[part] - + return perm diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a624b3d18c..9df3395850 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -67,7 +67,7 @@ //No need to update all of these procs if the guy is dead. if(stat != DEAD && !in_stasis) - if(air_master.current_cycle%4==2 || failed_last_breath || (health < config.health_threshold_crit)) //First, resolve location and get a breath + if(air_master.current_cycle%4==2 || failed_last_breath || (health <= config.health_threshold_crit)) //First, resolve location and get a breath breathe() //Only try to take a breath every 4 ticks, unless suffocating //Updates the number of stored chemicals for powers @@ -865,7 +865,7 @@ if(touching) touching.metabolize() if(ingested) ingested.metabolize() if(bloodstr) bloodstr.metabolize() - + if(CE_PAINKILLER in chem_effects) analgesic = chem_effects[CE_PAINKILLER] @@ -957,7 +957,7 @@ return 1 //UNCONSCIOUS. NO-ONE IS HOME - if( (getOxyLoss() > 50) || (config.health_threshold_crit > health) ) + if((getOxyLoss() > 50) || (health <= config.health_threshold_crit)) Paralyse(3) if(hallucination)