From c8c35acf3ab0aa8c5c2829874a5c5fff603569c2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 20 Jun 2015 22:12:38 +0930 Subject: [PATCH 1/4] 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 f6af73843c2..d62b89f3fae 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 2/4] 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 e51025aee2f..63198710227 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 d60a6b542d9..20278d07574 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 3/4] 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 6ff156b27fb..c396f8d4b9b 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 6c2eb7ced35..fa39ce719e7 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 b5ace0d5d59..2098c7c7765 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 4/4] 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 033042b8530..d5e7cd67bb7 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?"