diff --git a/baystation12.dme b/baystation12.dme index 0964b88a8c..3f02c6ad16 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -473,7 +473,6 @@ #include "code\game\objects\items\apc_frame.dm" #include "code\game\objects\items\blueprints.dm" #include "code\game\objects\items\bodybag.dm" -#include "code\game\objects\items\candle.dm" #include "code\game\objects\items\contraband.dm" #include "code\game\objects\items\crayons.dm" #include "code\game\objects\items\latexballoon.dm" @@ -528,6 +527,7 @@ #include "code\game\objects\items\stacks\tiles\plasteel.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" #include "code\game\objects\items\weapons\AI_modules.dm" +#include "code\game\objects\items\weapons\candle.dm" #include "code\game\objects\items\weapons\cards_ids.dm" #include "code\game\objects\items\weapons\cigs_lighters.dm" #include "code\game\objects\items\weapons\clown_items.dm" diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm index d36671e49f..95f7c26556 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm @@ -232,7 +232,7 @@ var/obj/structure/closet/crate/secure/gear/C = new(src.loc) var/num = rand(2,6) for(var/i=0,i= max_butts) user << "This ashtray is full." return diff --git a/code/WorkInProgress/Sigyn/Softcurity/jobs.dm b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm index 243dc47c75..a47e4ea43e 100644 --- a/code/WorkInProgress/Sigyn/Softcurity/jobs.dm +++ b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm @@ -83,7 +83,7 @@ H.equip_to_slot_or_del(CIG, slot_wear_mask) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/flame/lighter/zippo(H), slot_l_store) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 5ed7a675d5..a3544d7dd2 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1242,12 +1242,12 @@ proc/is_hot(obj/item/W as obj) return 3800 else return 0 - if(/obj/item/weapon/lighter) + if(/obj/item/weapon/flame/lighter) if(W:lit) return 1500 else return 0 - if(/obj/item/weapon/match) + if(/obj/item/weapon/flame/match) if(W:lit) return 1000 else @@ -1288,8 +1288,8 @@ proc/is_hot(obj/item/W as obj) istype(W, /obj/item/weapon/screwdriver) || \ istype(W, /obj/item/weapon/pen) || \ istype(W, /obj/item/weapon/weldingtool) || \ - istype(W, /obj/item/weapon/lighter/zippo) || \ - istype(W, /obj/item/weapon/match) || \ + istype(W, /obj/item/weapon/flame/lighter/zippo) || \ + istype(W, /obj/item/weapon/flame/match) || \ istype(W, /obj/item/clothing/mask/cigarette) || \ istype(W, /obj/item/weapon/shovel) \ ) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 8bf2845e10..cc0628c284 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -115,7 +115,7 @@ else H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/flame/lighter/zippo(H), slot_l_store) if(H.backbag == 1)//Why cant some of these things spawn in his office? H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5df804d84b..e9213e98a5 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -373,4 +373,15 @@ tot_rating += MB.rating storage_capacity["metal"] = tot_rating * 25000 - storage_capacity["glass"] = tot_rating * 12500 \ No newline at end of file + storage_capacity["glass"] = tot_rating * 12500 + +/obj/machinery/autolathe/dismantle() + ..() + var/list/sheets = list("metal" = /obj/item/stack/sheet/metal, "glass" = /obj/item/stack/sheet/glass) + + for(var/mat in stored_material) + var/T = sheets[mat] + var/obj/item/stack/sheet/S = new T + if(stored_material[mat] > S.perunit) + S.amount = round(stored_material[mat] / S.perunit) + S.loc = loc \ No newline at end of file diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 15e243559d..17389d93f8 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -788,10 +788,10 @@ product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." vend_delay = 34 icon_state = "cigs" - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4) - contraband = list(/obj/item/weapon/lighter/zippo = 4) + products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/flame/lighter/random = 4) + contraband = list(/obj/item/weapon/flame/lighter/zippo = 4) premium = list(/obj/item/weapon/storage/fancy/cigar = 5) - prices = list(/obj/item/weapon/storage/fancy/cigarettes = 15,/obj/item/weapon/storage/box/matches = 1,/obj/item/weapon/lighter/random = 2) + prices = list(/obj/item/weapon/storage/fancy/cigarettes = 15,/obj/item/weapon/storage/box/matches = 1,/obj/item/weapon/flame/lighter/random = 2) /obj/machinery/vending/medical diff --git a/code/game/objects/closets/ert.dm b/code/game/objects/closets/ert.dm index 27b8456bb6..341c76e64b 100644 --- a/code/game/objects/closets/ert.dm +++ b/code/game/objects/closets/ert.dm @@ -18,7 +18,7 @@ new /obj/item/weapon/gun/energy/ionrifle(src) new /obj/item/weapon/gun/energy/gun/nuclear(src) new /obj/item/clothing/glasses/thermal(src) - new /obj/item/weapon/lighter/zippo(src) + new /obj/item/weapon/flame/lighter/zippo(src) new /obj/item/weapon/pinpointer(src) return diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm deleted file mode 100644 index d1b39bf17b..0000000000 --- a/code/game/objects/items/candle.dm +++ /dev/null @@ -1,87 +0,0 @@ -/obj/item/candle - name = "red candle" - desc = "a candle" - icon = 'icons/obj/candle.dmi' - icon_state = "candle1" - item_state = "candle1" - w_class = 1 - - var/wax = 200 - var/lit = 0 - proc - light(var/flavor_text = "\red [usr] lights the [name].") - - - update_icon() - var/i - if(wax>150) - i = 1 - else if(wax>80) - i = 2 - else i = 3 - icon_state = "candle[i][lit ? "_lit" : ""]" - - - attackby(obj/item/weapon/W as obj, mob/user as mob) - ..() - if(istype(W, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = W - if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool - light("\red [user] casually lights the [name] with [W].") - else if(istype(W, /obj/item/weapon/lighter)) - var/obj/item/weapon/lighter/L = W - if(L.lit) - light() - else if(istype(W, /obj/item/weapon/match)) - var/obj/item/weapon/match/M = W - if(M.lit) - light() - else if(istype(W, /obj/item/candle)) - var/obj/item/candle/C = W - if(C.lit) - light() - - - light(var/flavor_text = "\red [usr] lights the [name].") - if(!src.lit) - src.lit = 1 - //src.damtype = "fire" - for(var/mob/O in viewers(usr, null)) - O.show_message(flavor_text, 1) - SetLuminosity(CANDLE_LUM) - processing_objects.Add(src) - - - process() - if(!lit) - return - wax-- - if(!wax) - new/obj/item/trash/candle(src.loc) - if(istype(src.loc, /mob)) - src.dropped() - del(src) - update_icon() - if(istype(loc, /turf)) //start a fire if possible - var/turf/T = loc - T.hotspot_expose(700, 5) - - - attack_self(mob/user as mob) - if(lit) - lit = 0 - update_icon() - SetLuminosity(0) - user.SetLuminosity(user.luminosity - CANDLE_LUM) - - - pickup(mob/user) - if(lit) - SetLuminosity(0) - user.SetLuminosity(user.luminosity + CANDLE_LUM) - - - dropped(mob/user) - if(lit) - user.SetLuminosity(user.luminosity - CANDLE_LUM) - SetLuminosity(CANDLE_LUM) diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm new file mode 100644 index 0000000000..593e85efdd --- /dev/null +++ b/code/game/objects/items/weapons/candle.dm @@ -0,0 +1,83 @@ +/obj/item/weapon/flame/candle + name = "red candle" + desc = "a candle" + icon = 'icons/obj/candle.dmi' + icon_state = "candle1" + item_state = "candle1" + w_class = 1 + + var/wax = 200 + +/obj/item/weapon/flame/candle/update_icon() + var/i + if(wax>150) + i = 1 + else if(wax>80) + i = 2 + else i = 3 + icon_state = "candle[i][lit ? "_lit" : ""]" + + +/obj/item/weapon/flame/candle/attackby(obj/item/weapon/W as obj, mob/user as mob) + ..() + if(istype(W, /obj/item/weapon/weldingtool)) + var/obj/item/weapon/weldingtool/WT = W + if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool + light("\red [user] casually lights the [name] with [W].") + else if(istype(W, /obj/item/weapon/flame/lighter)) + var/obj/item/weapon/flame/lighter/L = W + if(L.lit) + light() + else if(istype(W, /obj/item/weapon/flame/match)) + var/obj/item/weapon/flame/match/M = W + if(M.lit) + light() + else if(istype(W, /obj/item/weapon/flame/candle)) + var/obj/item/weapon/flame/candle/C = W + if(C.lit) + light() + + +/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "\red [usr] lights the [name].") + if(!src.lit) + src.lit = 1 + //src.damtype = "fire" + for(var/mob/O in viewers(usr, null)) + O.show_message(flavor_text, 1) + SetLuminosity(CANDLE_LUM) + processing_objects.Add(src) + + +/obj/item/weapon/flame/candle/process() + if(!lit) + return + wax-- + if(!wax) + new/obj/item/trash/candle(src.loc) + if(istype(src.loc, /mob)) + src.dropped() + del(src) + update_icon() + if(istype(loc, /turf)) //start a fire if possible + var/turf/T = loc + T.hotspot_expose(700, 5) + + +/obj/item/weapon/flame/candle/attack_self(mob/user as mob) + if(lit) + lit = 0 + update_icon() + SetLuminosity(0) + user.SetLuminosity(user.luminosity - CANDLE_LUM) + + +/obj/item/weapon/flame/candle/pickup(mob/user) + if(lit) + SetLuminosity(0) + user.SetLuminosity(user.luminosity + CANDLE_LUM) + + +/obj/item/weapon/flame/candle/dropped(mob/user) + if(lit) + user.SetLuminosity(user.luminosity - CANDLE_LUM) + SetLuminosity(CANDLE_LUM) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 9858616386..4d09a26bcf 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -12,22 +12,25 @@ ZIPPO CIGARETTE PACKETS ARE IN FANCY.DM */ +//For anything that can light stuff on fire +/obj/item/weapon/flame + var/lit = 0 + /////////// //MATCHES// /////////// -/obj/item/weapon/match +/obj/item/weapon/flame/match name = "match" desc = "A simple match stick, used for lighting fine smokables." icon = 'icons/obj/cigarettes.dmi' icon_state = "match_unlit" - var/lit = 0 var/burnt = 0 var/smoketime = 5 w_class = 1.0 origin_tech = "materials=1" attack_verb = list("burnt", "singed") -/obj/item/weapon/match/process() +/obj/item/weapon/flame/match/process() var/turf/location = get_turf(src) smoketime-- if(smoketime < 1) @@ -37,12 +40,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM location.hotspot_expose(700, 5) return -/obj/item/weapon/match/dropped(mob/user as mob) +/obj/item/weapon/flame/match/dropped(mob/user as mob) if(lit) burn_out() return ..() -/obj/item/weapon/match/proc/burn_out() +/obj/item/weapon/flame/match/proc/burn_out() lit = 0 burnt = 1 damtype = "brute" @@ -89,18 +92,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(WT.isOn())//Badasses dont get blinded while lighting their cig with a welding tool light("[user] casually lights the [name] with [W].") - else if(istype(W, /obj/item/weapon/lighter/zippo)) - var/obj/item/weapon/lighter/zippo/Z = W + else if(istype(W, /obj/item/weapon/flame/lighter/zippo)) + var/obj/item/weapon/flame/lighter/zippo/Z = W if(Z.lit) light("With a flick of their wrist, [user] lights their [name] with their [W].") - else if(istype(W, /obj/item/weapon/lighter)) - var/obj/item/weapon/lighter/L = W + else if(istype(W, /obj/item/weapon/flame/lighter)) + var/obj/item/weapon/flame/lighter/L = W if(L.lit) light("[user] manages to light their [name] with [W].") - else if(istype(W, /obj/item/weapon/match)) - var/obj/item/weapon/match/M = W + else if(istype(W, /obj/item/weapon/flame/match)) + var/obj/item/weapon/flame/match/M = W if(M.lit) light("[user] lights their [name] with their [W].") @@ -258,18 +261,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(WT.isOn()) light("[user] insults [name] by lighting it with [W].") - else if(istype(W, /obj/item/weapon/lighter/zippo)) - var/obj/item/weapon/lighter/zippo/Z = W + else if(istype(W, /obj/item/weapon/flame/lighter/zippo)) + var/obj/item/weapon/flame/lighter/zippo/Z = W if(Z.lit) light("With a flick of their wrist, [user] lights their [name] with their [W].") - else if(istype(W, /obj/item/weapon/lighter)) - var/obj/item/weapon/lighter/L = W + else if(istype(W, /obj/item/weapon/flame/lighter)) + var/obj/item/weapon/flame/lighter/L = W if(L.lit) light("[user] manages to offend their [name] by lighting it with [W].") - else if(istype(W, /obj/item/weapon/match)) - var/obj/item/weapon/match/M = W + else if(istype(W, /obj/item/weapon/flame/match)) + var/obj/item/weapon/flame/match/M = W if(M.lit) light("[user] lights their [name] with their [W].") @@ -340,18 +343,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(WT.isOn())// light("[user] recklessly lights [name] with [W].") - else if(istype(W, /obj/item/weapon/lighter/zippo)) - var/obj/item/weapon/lighter/zippo/Z = W + else if(istype(W, /obj/item/weapon/flame/lighter/zippo)) + var/obj/item/weapon/flame/lighter/zippo/Z = W if(Z.lit) light("With much care, [user] lights their [name] with their [W].") - else if(istype(W, /obj/item/weapon/lighter)) - var/obj/item/weapon/lighter/L = W + else if(istype(W, /obj/item/weapon/flame/lighter)) + var/obj/item/weapon/flame/lighter/L = W if(L.lit) light("[user] manages to light their [name] with [W].") - else if(istype(W, /obj/item/weapon/match)) - var/obj/item/weapon/match/M = W + else if(istype(W, /obj/item/weapon/flame/match)) + var/obj/item/weapon/flame/match/M = W if(M.lit) light("[user] lights their [name] with their [W].") @@ -372,7 +375,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ///////// //ZIPPO// ///////// -/obj/item/weapon/lighter +/obj/item/weapon/flame/lighter name = "cheap lighter" desc = "A cheap-as-free lighter." icon = 'icons/obj/items.dmi' @@ -385,9 +388,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM flags = TABLEPASS | CONDUCT slot_flags = SLOT_BELT attack_verb = list("burnt", "singed") - var/lit = 0 -/obj/item/weapon/lighter/zippo +/obj/item/weapon/flame/lighter/zippo name = "\improper Zippo lighter" desc = "The zippo." icon_state = "zippo" @@ -395,20 +397,20 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_on = "zippoon" icon_off = "zippo" -/obj/item/weapon/lighter/random +/obj/item/weapon/flame/lighter/random New() var/color = pick("r","c","y","g") icon_on = "lighter-[color]-on" icon_off = "lighter-[color]" icon_state = icon_off -/obj/item/weapon/lighter/attack_self(mob/living/user) +/obj/item/weapon/flame/lighter/attack_self(mob/living/user) if(user.r_hand == src || user.l_hand == src) if(!lit) lit = 1 icon_state = icon_on item_state = icon_on - if(istype(src, /obj/item/weapon/lighter/zippo) ) + if(istype(src, /obj/item/weapon/flame/lighter/zippo) ) user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") else if(prob(95)) @@ -427,7 +429,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = 0 icon_state = icon_off item_state = icon_off - if(istype(src, /obj/item/weapon/lighter/zippo) ) + if(istype(src, /obj/item/weapon/flame/lighter/zippo) ) user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.") else user.visible_message("[user] quietly shuts off the [src].") @@ -439,7 +441,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return -/obj/item/weapon/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/flame/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M, /mob)) return @@ -448,28 +450,28 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(M == user) cig.attackby(src, user) else - if(istype(src, /obj/item/weapon/lighter/zippo)) + if(istype(src, /obj/item/weapon/flame/lighter/zippo)) cig.light("[user] whips the [name] out and holds it for [M].") else cig.light("[user] holds the [name] out for [M], and lights the [cig.name].") else ..() -/obj/item/weapon/lighter/process() +/obj/item/weapon/flame/lighter/process() var/turf/location = get_turf(src) if(location) location.hotspot_expose(700, 5) return -/obj/item/weapon/lighter/pickup(mob/user) +/obj/item/weapon/flame/lighter/pickup(mob/user) if(lit) SetLuminosity(0) user.SetLuminosity(user.luminosity+2) return -/obj/item/weapon/lighter/dropped(mob/user) +/obj/item/weapon/flame/lighter/dropped(mob/user) if(lit) user.SetLuminosity(user.luminosity-2) SetLuminosity(2) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index b7f6c88165..ca6005354e 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -62,7 +62,7 @@ "/obj/item/weapon/reagent_containers/pill", "/obj/item/weapon/reagent_containers/syringe", "/obj/item/weapon/reagent_containers/glass/dispenser", - "/obj/item/weapon/lighter/zippo", + "/obj/item/weapon/flame/lighter/zippo", "/obj/item/weapon/storage/fancy/cigarettes", "/obj/item/weapon/storage/pill_bottle", "/obj/item/stack/medical", @@ -93,15 +93,14 @@ "/obj/item/weapon/reagent_containers/food/snacks/donut/jelly", "/obj/item/weapon/melee/baton", "/obj/item/weapon/gun/energy/taser", - "/obj/item/weapon/lighter/zippo", + "/obj/item/weapon/flame/lighter/zippo", "/obj/item/weapon/cigpacket", "/obj/item/clothing/glasses/hud/security", "/obj/item/device/flashlight", "/obj/item/device/pda", "/obj/item/device/radio/headset", "/obj/item/weapon/melee", - "/obj/item/taperoll/police", - "/obj/item/weapon/gun/energy/taser" + "/obj/item/taperoll/police" ) /obj/item/weapon/storage/belt/soulstone @@ -141,24 +140,4 @@ item_state = "swatbelt" storage_slots = 9 max_w_class = 3 - max_combined_w_class = 21 - can_hold = list( - "/obj/item/weapon/grenade/flashbang", - "/obj/item/weapon/reagent_containers/spray/pepper", - "/obj/item/weapon/handcuffs", - "/obj/item/device/flash", - "/obj/item/clothing/glasses", - "/obj/item/ammo_casing/shotgun", - "/obj/item/ammo_magazine", - "/obj/item/weapon/reagent_containers/food/snacks/donut/normal", - "/obj/item/weapon/reagent_containers/food/snacks/donut/jelly", - "/obj/item/weapon/melee/baton", - "/obj/item/weapon/gun/energy/taser", - "/obj/item/weapon/lighter/zippo", - "/obj/item/weapon/cigpacket", - "/obj/item/clothing/glasses/hud/security", - "/obj/item/device/flashlight", - "/obj/item/device/pda", - "/obj/item/device/radio/headset", - "/obj/item/weapon/melee" - ) \ No newline at end of file + max_combined_w_class = 21 \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index dea00bcf08..f480e92185 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -446,14 +446,14 @@ w_class = 1 flags = TABLEPASS slot_flags = SLOT_BELT - can_hold = list("/obj/item/weapon/match") + can_hold = list("/obj/item/weapon/flame/match") New() ..() for(var/i=1; i <= storage_slots; i++) - new /obj/item/weapon/match(src) + new /obj/item/weapon/flame/match(src) - attackby(obj/item/weapon/match/W as obj, mob/user as mob) + attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob) if(istype(W) && !W.lit && !W.burnt) W.lit = 1 W.damtype = "burn" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 061548848c..75c2769022 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -97,7 +97,7 @@ /obj/item/weapon/storage/fancy/candle_box/New() ..() for(var/i=1; i <= storage_slots; i++) - new /obj/item/candle(src) + new /obj/item/weapon/flame/candle(src) return /* diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 83edc1968a..8f6579c830 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -16,8 +16,8 @@ "/obj/item/weapon/dice", "/obj/item/weapon/disk", "/obj/item/weapon/implanter", - "/obj/item/weapon/lighter", - "/obj/item/weapon/match", + "/obj/item/weapon/flame/lighter", + "/obj/item/weapon/flame/match", "/obj/item/weapon/paper", "/obj/item/weapon/pen", "/obj/item/weapon/photo", diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index f22735bf15..28192bde39 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -50,6 +50,8 @@ oxytanks.Add(I) oxygentanks++ user << "You put [I] in [src]." + if(oxygentanks < 5) + update_icon() else user << "[src] is full." updateUsrDialog() @@ -61,6 +63,8 @@ platanks.Add(I) phorontanks++ user << "You put [I] in [src]." + if(oxygentanks < 6) + update_icon() else user << "[src] is full." updateUsrDialog() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 73e615f577..431abb22d0 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -845,7 +845,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt) - M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/flame/lighter/zippo(M), slot_r_store) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) var/obj/item/weapon/card/id/W = new(M) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index b90fbe5b7f..8bbbe6a5cc 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -227,7 +227,7 @@ corpsehelmet = /obj/item/clothing/head/centhat corpsegloves = /obj/item/clothing/gloves/swat corpseshoes = /obj/item/clothing/shoes/swat - corpsepocket1 = /obj/item/weapon/lighter/zippo + corpsepocket1 = /obj/item/weapon/flame/lighter/zippo corpseid = 1 corpseidjob = "Commander" corpseidaccess = "Captain" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index acba8dc929..d29a870614 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -78,7 +78,7 @@ item_state = "det_suit" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS - allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) + allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index b37489cc31..5c29eec762 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -216,7 +216,7 @@ icon_state = "johann_erzatz_1" volume = 50 -/obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda +/obj/item/weapon/flame/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda name = "blue zippo lighter" desc = "A zippo lighter made of some blue metal." icon = 'icons/obj/custom_items.dmi' @@ -224,7 +224,7 @@ icon_on = "bluezippoon" icon_off = "bluezippo" -/obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess +/obj/item/weapon/flame/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess name = "engraved lighter" desc = "A golden lighter, engraved with some ornaments and a G." icon = 'icons/obj/custom_items.dmi' @@ -234,7 +234,7 @@ ///////////////////////////// Ziepes - Janis Godmanis - Red Zippo ////////////////////// -/obj/item/weapon/lighter/zippo/fluff/janis_godmanis +/obj/item/weapon/flame/lighter/zippo/fluff/janis_godmanis name = "Red-White-Red Zippo" desc = "A badass zippo that looks like the Austrian flag. Upon closer inspection it is revealed that it's a different shade of red than the Austrian flag.." icon = 'icons/obj/custom_items.dmi' @@ -244,7 +244,7 @@ ////////////////////////////// Vivallion - Isaac Jachym - Butterfly Lighter //////////// -/obj/item/weapon/lighter/zippo/fluff/isaac_jachym +/obj/item/weapon/flame/lighter/zippo/fluff/isaac_jachym name = "Butterfly lighter" desc = "A custom-made zippo lighter, looks rather expensive. On one of it's sides, a clean inscription has been made, 'Butterfly, what is your wisdom?' And I looked down at it's majestic form, flexing it's wings as if to show it's strength. 'Fuck chechenya.' Had it whispered, before fluttering away, and so we went to war." icon = 'icons/obj/custom_items.dmi' @@ -252,7 +252,7 @@ icon_on = "che_zippoon" icon_off = "che_zippo" -/obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin +/obj/item/weapon/flame/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin name = "Riley's black zippo" desc = "A black zippo lighter, which holds some form of sentimental value." icon = 'icons/obj/custom_items.dmi' @@ -260,7 +260,7 @@ icon_on = "blackzippoon" icon_off = "blackzippo" -/obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan +/obj/item/weapon/flame/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan name = "Graduation Lighter" desc = "A silver engraved lighter with 41 on one side and Tharsis University on the other. The lid reads Fay Sullivan, Cybernetic Engineering, 2541" icon = 'icons/obj/custom_items.dmi' @@ -268,7 +268,7 @@ icon_on = "gradzippoon" icon_off = "gradzippo" -/obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke +/obj/item/weapon/flame/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke name = "Gonzo Fist zippo" desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish." icon = 'icons/obj/custom_items.dmi' @@ -276,7 +276,7 @@ icon_on = "gonzozippoon" icon_off = "gonzozippo" -/obj/item/weapon/lighter/zippo/fluff/naples_1 //naples: Russell Vierson +/obj/item/weapon/flame/lighter/zippo/fluff/naples_1 //naples: Russell Vierson name = "Engraved zippo" desc = "A intricately engraved Zippo lighter." icon = 'icons/obj/custom_items.dmi' diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 504234d988..f71b7f9d35 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -20,7 +20,7 @@ new/obj/item/weapon/reagent_containers/food/drinks/bottle/rum(src) new/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus(src) new/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src) - new/obj/item/weapon/lighter/zippo(src) + new/obj/item/weapon/flame/lighter/zippo(src) if(2) new/obj/item/weapon/pickaxe/drill(src) new/obj/item/device/taperecorder(src) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f7dc3a30ff..57484c001a 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1316,7 +1316,9 @@ see_invisible = SEE_INVISIBLE_LIVING seer = 0 + var/tmp/has_ninja_mask = 0 if(istype(wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)) + has_ninja_mask = 1 var/obj/item/clothing/mask/gas/voice/space_ninja/O = wear_mask switch(O.mode) if(0) @@ -1362,7 +1364,7 @@ if(!druggy) see_invisible = SEE_INVISIBLE_LIVING - else if(!seer) + else if(!seer && !has_ninja_mask) see_invisible = SEE_INVISIBLE_LIVING diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 4316fbd314..4b2df530c9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -299,7 +299,7 @@ src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) - var/obj/item/weapon/lighter/zippo/L = new /obj/item/weapon/lighter/zippo(src) + var/obj/item/weapon/flame/lighter/zippo/L = new /obj/item/weapon/flame/lighter/zippo(src) L.lit = 1 src.modules += L diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 363f218eb6..110c505b31 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -444,6 +444,19 @@ datum/preferences clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY) if(4) clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + if(XENOBIOLOGIST) + clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s") + clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) + if(prob(1)) + clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY) + switch(backbag) + if(2) + clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + if(3) + clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY) + if(4) + clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) if(CHEMIST) clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 05f7635bcf..036e13e3c4 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -639,36 +639,37 @@ Note that amputating the affected organ does in fact remove the infection from t if(!(status & ORGAN_ROBOT)) organ = new /obj/item/weapon/organ/l_foot(owner.loc, owner) owner.u_equip(owner.shoes) + + destspawn = 1 + //Robotic limbs explode if sabotaged. + if(status & ORGAN_ROBOT && !no_explode && sabotaged) + owner.visible_message("\red \The [owner]'s [display_name] explodes violently!",\ + "\red Your [display_name] explodes!",\ + "You hear an explosion followed by a scream!") + explosion(get_turf(owner),-1,-1,2,3) + var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() + spark_system.set_up(5, 0, owner) + spark_system.attach(owner) + spark_system.start() + spawn(10) + del(spark_system) + + owner.visible_message("\red [owner.name]'s [display_name] flies off in an arc.",\ + "Your [display_name] goes flying off!",\ + "You hear a terrible sound of ripping tendons and flesh.") + if(organ) - destspawn = 1 - //Robotic limbs explode if sabotaged. - if(status & ORGAN_ROBOT && !no_explode && sabotaged) - owner.visible_message("\red \The [owner]'s [display_name] explodes violently!",\ - "\red Your [display_name] explodes!",\ - "You hear an explosion followed by a scream!") - explosion(get_turf(owner),-1,-1,2,3) - var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() - spark_system.set_up(5, 0, owner) - spark_system.attach(owner) - spark_system.start() - spawn(10) - del(spark_system) - - owner.visible_message("\red [owner.name]'s [display_name] flies off in an arc.",\ - "Your [display_name] goes flying off!",\ - "You hear a terrible sound of ripping tendons and flesh.") - //Throw organs around var/lol = pick(cardinal) step(organ,lol) - owner.update_body(1) + owner.update_body(1) - // OK so maybe your limb just flew off, but if it was attached to a pair of cuffs then hooray! Freedom! - release_restraints() + // OK so maybe your limb just flew off, but if it was attached to a pair of cuffs then hooray! Freedom! + release_restraints() - if(vital) - owner.death() + if(vital) + owner.death() /**************************************************** HELPERS diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c2100f140c..3b3f6c154e 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -267,11 +267,11 @@ \[hr\] : Adds a horizontal rule. "}, "window=paper_help") -/obj/item/weapon/paper/proc/burnpaper(obj/item/weapon/lighter/P, mob/user) +/obj/item/weapon/paper/proc/burnpaper(obj/item/weapon/flame/P, mob/user) var/class = "" if(P.lit && !user.restrained()) - if(istype(P, /obj/item/weapon/lighter/zippo)) + if(istype(P, /obj/item/weapon/flame/lighter/zippo)) class = "" user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \ @@ -435,7 +435,7 @@ user << "You stamp the paper with your rubber stamp." - else if(istype(P, /obj/item/weapon/lighter)) + else if(istype(P, /obj/item/weapon/flame)) burnpaper(P, user) add_fingerprint(user) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 0143b595ad..704afe76d5 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -44,7 +44,7 @@ user << "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]." user.drop_from_inventory(W) W.loc = src - else if(istype(W, /obj/item/weapon/lighter)) + else if(istype(W, /obj/item/weapon/flame/lighter)) burnpaper(W, user) else if(istype(W, /obj/item/weapon/paper_bundle)) user.drop_from_inventory(W) @@ -69,11 +69,11 @@ return -/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/lighter/P, mob/user) +/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/lighter/P, mob/user) var/class = "" if(P.lit && !user.restrained()) - if(istype(P, /obj/item/weapon/lighter/zippo)) + if(istype(P, /obj/item/weapon/flame/lighter/zippo)) class = "" user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \ diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index f94d0de80b..abf15f3e2b 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -205,24 +205,6 @@ return var/obj/structure/disposalpipe/CP = locate() in T - if(ptype>=6 && ptype <= 8) // Disposal or outlet - if(CP) // There's something there - if(!istype(CP,/obj/structure/disposalpipe/trunk)) - user << "The [nicetype] requires a trunk underneath it in order to work." - return - else // Nothing under, fuck. - user << "The [nicetype] requires a trunk underneath it in order to work." - return - else - if(CP) - update() - var/pdir = CP.dpdir - if(istype(CP, /obj/structure/disposalpipe/broken)) - pdir = CP.dir - if(pdir & dpdir) - user << "There is already a [nicetype] at that location." - return - if(istype(I, /obj/item/weapon/wrench)) if(anchored) @@ -234,7 +216,25 @@ density = 1 user << "You detach the [nicetype] from the underfloor." else - anchored = 1 + if(ptype>=6 && ptype <= 8) // Disposal or outlet + if(CP) // There's something there + if(!istype(CP,/obj/structure/disposalpipe/trunk)) + user << "The [nicetype] requires a trunk underneath it in order to work." + return + else // Nothing under, fuck. + user << "The [nicetype] requires a trunk underneath it in order to work." + return + else + if(CP) + update() + var/pdir = CP.dpdir + if(istype(CP, /obj/structure/disposalpipe/broken)) + pdir = CP.dir + if(pdir & dpdir) + user << "There is already a [nicetype] at that location." + return + + anchored = 1 if(ispipe) level = 1 // We don't want disposal bins to disappear under the floors density = 0 diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm index 56954dc6dd..1b3afdd22c 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm @@ -54,8 +54,7 @@ /obj/item/weapon/handcuffs,\ /obj/item/weapon/hemostat,\ /obj/item/weapon/kitchenknife,\ - /obj/item/weapon/lighter,\ - /obj/item/weapon/lighter,\ + /obj/item/weapon/flame/lighter,\ /obj/item/weapon/light/bulb,\ /obj/item/weapon/light/tube,\ /obj/item/weapon/pickaxe,\ diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index 30d2c6354a..22593fa4f5 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -282,9 +282,8 @@ var/list/valid_secondary_effect_types = list(\ if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25)) secondary_effect.ToggleActivate(0) - else if (istype(W,/obj/item/weapon/match) && W:lit ||\ - istype(W,/obj/item/weapon/weldingtool) && W:welding ||\ - istype(W,/obj/item/weapon/lighter) && W:lit) + else if (istype(W,/obj/item/weapon/flame) && W:lit ||\ + istype(W,/obj/item/weapon/weldingtool) && W:welding) if(my_effect.trigger == TRIGGER_HEAT) my_effect.ToggleActivate() if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && prob(25)) diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 09f91d0342..343e54a3bf 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -194,7 +194,7 @@ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains along part of it")]." if(10) item_type = "[pick("cylinder","tank","chamber")]" - new_item = new /obj/item/weapon/lighter(src.loc) + new_item = new /obj/item/weapon/flame/lighter(src.loc) additional_desc = "There is a tiny device attached." if(prob(30)) apply_image_decorations = 1 diff --git a/code/modules/surgery/eye.dm b/code/modules/surgery/eye.dm index 69e238679e..9e39866355 100644 --- a/code/modules/surgery/eye.dm +++ b/code/modules/surgery/eye.dm @@ -111,7 +111,7 @@ allowed_tools = list( /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ + /obj/item/weapon/flame/lighter = 50, \ /obj/item/weapon/weldingtool = 25 ) diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index 7c04800f5a..6e5fb5dfb5 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -104,7 +104,7 @@ allowed_tools = list( /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ + /obj/item/weapon/flame/lighter = 50, \ /obj/item/weapon/weldingtool = 25 ) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 5109b72ef2..551369a7cf 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -237,7 +237,7 @@ allowed_tools = list( /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ + /obj/item/weapon/flame/lighter = 50, \ /obj/item/weapon/weldingtool = 25 ) diff --git a/code/modules/surgery/headreattach.dm b/code/modules/surgery/headreattach.dm index 72da44cc81..2a29b7e768 100644 --- a/code/modules/surgery/headreattach.dm +++ b/code/modules/surgery/headreattach.dm @@ -120,7 +120,7 @@ allowed_tools = list( /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ + /obj/item/weapon/flame/lighter = 50, \ /obj/item/weapon/weldingtool = 25 ) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index b2352dcf2e..57df6a398c 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -71,7 +71,7 @@ allowed_tools = list( /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ + /obj/item/weapon/flame/lighter = 50, \ /obj/item/weapon/weldingtool = 25 ) diff --git a/code/modules/surgery/robolimbs.dm b/code/modules/surgery/robolimbs.dm index 354b448378..c1328227ac 100644 --- a/code/modules/surgery/robolimbs.dm +++ b/code/modules/surgery/robolimbs.dm @@ -94,7 +94,7 @@ allowed_tools = list( /obj/item/weapon/cautery = 100, \ /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ + /obj/item/weapon/flame/lighter = 50, \ /obj/item/weapon/weldingtool = 25 ) diff --git a/code/unused/computer2/peripherals.dm b/code/unused/computer2/peripherals.dm index 1e6ff79e8b..2316e3b10e 100644 --- a/code/unused/computer2/peripherals.dm +++ b/code/unused/computer2/peripherals.dm @@ -162,7 +162,7 @@ prize.name = "electronic blink toy game" prize.desc = "Blink. Blink. Blink." if(3) - prize = new /obj/item/weapon/lighter/zippo( prize_location ) + prize = new /obj/item/weapon/flame/lighter/zippo( prize_location ) prize.name = "Burno Lighter" prize.desc = "Almost like a decent lighter!" if(4) diff --git a/html/changelog.html b/html/changelog.html index e5fe332b92..641a079d73 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -133,6 +133,11 @@ should be listed in the changelog upon commit though. Thanks. -->
  • Stun batons now work like tasers and deal agony instead of stun
  • Being hit in the hands with a stun weapon will cause whatever is being held to be dropped
  • Handcuffs now require an aggressive grab to be used
    • +

    31 August 2014

    +

    Whitellama updated:

    +
      +
    • Matches and candles can be used to burn papers, too.
      • +
    • Observers have a bit more time (20 seconds, instead of 7.5) before the Diona join prompt disappears.
    @@ -146,7 +151,7 @@ should be listed in the changelog upon commit though. Thanks. -->

    Whitellama updated:

    • Arcane tomes can now be stored on bookshelves.
      • -
    • Dionaea players no longer crash on death, and now properly nymphs properly.
      • +
    • Dionaea players no longer crash on death, and now become nymphs properly.
    @@ -311,6 +316,31 @@ should be listed in the changelog upon commit though. Thanks. --> +
    +

    23 Mai 2014

    +

    Hubble updated:

    +
      +
    • Personal lockers are now resettable
      • +
    • Take off people's accessories or change their sensors in the drag and drop-interface
      • +
    • Merge paper bundles by hitting one with another
      • +
    • Line breaks in Security, Medical and Employment Records
      • +
    • Record printouts will have names on it
      • +
    • Set other people's internals in belt and suit storage slots
      • +
    • No longer changing suit sensors while cuffed
      • +
    • No longer emptying other people's pockets when they are not full yet
      • +
    +
    + + +
    +

    6 Mai 2014

    +

    Hubble updated:

    +
      +
    • Clip papers together by hitting a paper with a paper or photo
      • +
    • Adds icons for copied stamps
      • +
    +
    +

    3 May 2014

    @@ -324,19 +354,19 @@ should be listed in the changelog upon commit though. Thanks. -->
    - - - -
    -

    28 мая 2014

    -

    Chinsky updated:

    -
      -
    • Adds few new paperBBcode tags, to make up for HTML removal.
      • -
    • [logo] tag draws NT logo image (one from wiki).
      • -
    • [table] [/table] tags mark borders of tables. [grid] [/grid] are borderless tables, useful of making layouts. Inside tables following tags are used: [row] marks beginning of new table row, [cell] - beginning of new table cell.
      • -
    -
    -
    + + + +
    +

    28 мая 2014

    +

    Chinsky updated:

    +
      +
    • Adds few new paperBBcode tags, to make up for HTML removal.
      • +
    • [logo] tag draws NT logo image (one from wiki).
      • +
    • [table] [/table] tags mark borders of tables. [grid] [/grid] are borderless tables, useful of making layouts. Inside tables following tags are used: [row] marks beginning of new table row, [cell] - beginning of new table cell.
      • +
    +
    +

    29 April 2014