diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 9e99624d0b1..be4c641251d 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -80,28 +80,8 @@ var/turf/newLoc = get_step(src,direction) if(!(newLoc.flags & NOJAUNT)) loc = newLoc -/* - switch(direction) - if(NORTH) - src.y++ - if(SOUTH) - src.y-- - if(EAST) - src.x++ - if(WEST) - src.x-- - if(NORTHEAST) - src.y++ - src.x++ - if(NORTHWEST) - src.y++ - src.x-- - if(SOUTHEAST) - src.y-- - src.x++ - if(SOUTHWEST) - src.y-- - src.x-- */ + else + user << "Some strange aura is blocking the way!" src.canmove = 0 spawn(2) src.canmove = 1 diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index e68dcd2dcad..92a84398f9a 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -11,6 +11,18 @@ idle_power_usage = 20 active_power_usage = 80 +//fix for issue 521, by QualityVan. +//someone should really look into why circuits have a powernet var, it's several kinds of retarded. +/obj/machinery/power/monitor/New() + ..() + var/obj/structure/cable/attached = null + var/turf/T = loc + if(isturf(T)) + attached = locate() in T + if(attached) + powernet = attached.get_powernet() + + /obj/machinery/power/monitor/attack_ai(mob/user) add_fingerprint(user) diff --git a/code/game/objects/grenades/chem_grenade.dm b/code/game/objects/grenades/chem_grenade.dm index 571711028e7..bdd00c3e116 100644 --- a/code/game/objects/grenades/chem_grenade.dm +++ b/code/game/objects/grenades/chem_grenade.dm @@ -13,11 +13,16 @@ var/list/beakers = new/list() var/list/allowed_containers = list("/obj/item/weapon/reagent_containers/glass/beaker", "/obj/item/weapon/reagent_containers/glass/dispenser", "/obj/item/weapon/reagent_containers/glass/bottle") var/affected_area = 3 + New() var/datum/reagents/R = new/datum/reagents(1000) reagents = R R.my_atom = src + attack_self(mob/user as mob) + if(stage > 1) + ..() + attackby(obj/item/weapon/W as obj, mob/user as mob)//TODO:Have grenades use the new assembly things if(istype(W,/obj/item/device/assembly_holder) && !stage && path != 2) diff --git a/code/game/objects/grenades/grenade.dm b/code/game/objects/grenades/grenade.dm index 9118374c485..37852c6b82b 100644 --- a/code/game/objects/grenades/grenade.dm +++ b/code/game/objects/grenades/grenade.dm @@ -1,7 +1,6 @@ /obj/item/weapon/grenade - var/det_time = 50 - desc = "It is set to detonate in 5 seconds." name = "grenade" + desc = "A hand held grenade, with an adjustable timer." w_class = 2.0 icon = 'icons/obj/grenade.dmi' icon_state = "grenade" @@ -11,80 +10,94 @@ flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BELT var/active = 0 + var/det_time = 50 - proc/clown_check(var/mob/living/user) - if((CLUMSY in user.mutations) && prob(50)) - user << "\red Huh? How does this thing work?!" - src.active = 1 - src.icon_state = initial(icon_state) + "_active" - playsound(src.loc, 'armbomb.ogg', 75, 1, -3) - spawn(5) - src.prime() - return 0 - return 1 +/obj/item/weapon/grenade/proc/clown_check(var/mob/living/user) + if((CLUMSY in user.mutations) && prob(50)) + user << "Huh? How does this thing work?" + active = 1 + icon_state = initial(icon_state) + "_active" + playsound(loc, 'armbomb.ogg', 75, 1, -3) + spawn(5) + if(user) + user.drop_item() + prime() + return 0 + return 1 -/* afterattack(atom/target as mob|obj|turf|area, mob/user as mob) - if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container - if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..() - if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc) - user << "\red You prime the [name]! [det_time/10] seconds!" - src.active = 1 - src.icon_state = initial(icon_state) + "_active" - playsound(src.loc, 'armbomb.ogg', 75, 1, -3) - spawn(src.det_time) - src.prime() + +/*/obj/item/weapon/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) + if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container + if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..() + if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc) + user << "You prime the [name]! [det_time/10] seconds!" + active = 1 + icon_state = initial(icon_state) + "_active" + playsound(loc, 'armbomb.ogg', 75, 1, -3) + spawn(det_time) + prime() + return + user.dir = get_dir(user, target) + user.drop_item() + var/t = (isturf(target) ? target : target.loc) + walk_towards(src, t, 3) + return*/ + + +/obj/item/weapon/grenade/examine() + set src in usr + usr << desc + if(det_time > 1) + usr << "The timer is set to [det_time/10] seconds." + return + usr << "\The [src] is set for instant detonation." + + +/obj/item/weapon/grenade/attack_self(mob/user as mob) + if(!active) + if(clown_check(user)) + user << "You prime the [name]! [det_time/10] seconds!" + active = 1 + icon_state = initial(icon_state) + "_active" + add_fingerprint(user) + if(iscarbon(user)) + var/mob/living/carbon/C = user + C.throw_mode_on() + spawn(det_time) + if(user) + user.drop_item() + prime() return - user.dir = get_dir(user, target) - user.drop_item() - var/t = (isturf(target) ? target : target.loc) - walk_towards(src, t, 3) - return*/ + return - attack_self(mob/user as mob) - if(!active) - if(clown_check(user)) - user << "\red You prime the [name]! [det_time/10] seconds!" - src.active = 1 - src.icon_state = initial(icon_state) + "_active" - add_fingerprint(user) - if(iscarbon(user)) - var/mob/living/carbon/C = user - C.throw_mode_on() - spawn(src.det_time) - src.prime() - return - return +/obj/item/weapon/grenade/proc/prime() + playsound(loc, 'Welder2.ogg', 25, 1) + var/turf/T = get_turf(src) + if(T) + T.hotspot_expose(700,125) - proc/prime() - playsound(src.loc, 'Welder2.ogg', 25, 1) - var/turf/T = get_turf(src) - if(T) - T.hotspot_expose(700,125) +/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(isscrewdriver(W)) + switch(det_time) + if ("1") + det_time = 30 + user << "You set the [name] for 3 second detonation time." + if ("30") + det_time = 100 + user << "You set the [name] for 10 second detonation time." + if ("100") + det_time = 1 + user << "You set the [name] for instant detonation." + add_fingerprint(user) + ..() + return +/obj/item/weapon/grenade/attack_hand() + walk(src, null, null) + ..() + return - attackby(obj/item/weapon/W as obj, mob/user as mob) - if (isscrewdriver(W)) - switch(src.det_time) - if ("1") - src.det_time = 30 - user.show_message("\blue You set the [name] for 3 second detonation time.") - if ("30") - src.det_time = 100 - user.show_message("\blue You set the [name] for 10 second detonation time.") - if ("100") - src.det_time = 1 - user.show_message("\blue You set the [name] for instant detonation.") - src.add_fingerprint(user) - src.desc = "It is set to detonate [det_time-1 ? "in [det_time/10] seconds." : "instantly."]" - ..() - return - - attack_hand() - walk(src, null, null) - ..() - return - - attack_paw(mob/user as mob) - return src.attack_hand(user) +/obj/item/weapon/grenade/attack_paw(mob/user as mob) + return attack_hand(user) diff --git a/code/game/objects/grenades/mustardbomb.dm b/code/game/objects/grenades/mustardbomb.dm deleted file mode 100644 index 84960d75fe6..00000000000 --- a/code/game/objects/grenades/mustardbomb.dm +++ /dev/null @@ -1,32 +0,0 @@ -/obj/item/weapon/grenade/mustardbomb - desc = "It is set to detonate in 4 seconds." - name = "mustard gas bomb" - icon = 'icons/obj/grenade.dmi' - icon_state = "flashbang" - det_time = 40.0 - item_state = "flashbang" - var/datum/effect/effect/system/mustard_gas_spread/mustard_gas - - New() - ..() - src.mustard_gas = new /datum/effect/effect/system/mustard_gas_spread - src.mustard_gas.attach(src) - src.mustard_gas.set_up(5, 0, usr.loc) - - prime() - playsound(src.loc, 'smoke.ogg', 50, 1, -3) - spawn(0) - src.mustard_gas.start() - sleep(10) - src.mustard_gas.start() - sleep(10) - src.mustard_gas.start() - sleep(10) - src.mustard_gas.start() - for(var/obj/effect/blob/B in view(8,src)) - var/damage = round(30/(get_dist(B,src)+1)) - B.health -= damage - B.update_icon() - sleep(100) - del(src) - return diff --git a/code/game/objects/items/weapons/stungloves.dm b/code/game/objects/items/weapons/stungloves.dm index 29801a763d4..acfacab4238 100644 --- a/code/game/objects/items/weapons/stungloves.dm +++ b/code/game/objects/items/weapons/stungloves.dm @@ -27,14 +27,15 @@ else if(istype(W, /obj/item/weapon/wirecutters)) if(cell) + cell.updateicon() cell.loc = get_turf(src.loc) - cell = 0 + cell = null user << "You cut the cell away from [src]." update_icon() return if(wired) //wires disappear into the void because fuck that shit wired = 0 - siemens_coefficient = siemens_coefficient_archived + siemens_coefficient = initial(siemens_coefficient) user << "You cut the wires away from [src]." update_icon() ..() @@ -46,7 +47,4 @@ if(wired) overlays += "gloves_wire" if(cell) - overlays += "gloves_cell" - -/obj/item/clothing/gloves/New() - siemens_coefficient_archived = siemens_coefficient \ No newline at end of file + overlays += "gloves_cell" \ No newline at end of file diff --git a/code/game/objects/watercloset.dm b/code/game/objects/watercloset.dm index 9de43d384d0..28a1c24b1c1 100644 --- a/code/game/objects/watercloset.dm +++ b/code/game/objects/watercloset.dm @@ -245,12 +245,12 @@ var/mob/living/carbon/C = M if(watertemp == "freezing") - C.bodytemperature = min(100, C.bodytemperature - 80) + C.bodytemperature = max(80, C.bodytemperature - 80) C << "The water is freezing!" return if(watertemp == "boiling") - C.bodytemperature = max(500, C.bodytemperature + 35) - C.adjustFireLoss(10) + C.bodytemperature = min(500, C.bodytemperature + 35) + C.adjustFireLoss(5) C << "The water is searing!" return diff --git a/code/game/turf.dm b/code/game/turf.dm index ecbc4c0977d..51beb7c09aa 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -1868,4 +1868,3 @@ turf/simulated/floor/proc/update_icon() if(flags & NOJAUNT) return flags |= NOJAUNT - overlays += image('icons/effects/water.dmi',src,"holywater") diff --git a/code/modules/clothing/gloves.dm b/code/modules/clothing/gloves.dm index e851aae6412..57e9f4a4c08 100644 --- a/code/modules/clothing/gloves.dm +++ b/code/modules/clothing/gloves.dm @@ -6,7 +6,6 @@ protective_temperature = 400 heat_transfer_coefficient = 0.25 siemens_coefficient = 0.50 - var/siemens_coefficient_archived = 0 var/wired = 0 var/obj/item/weapon/cell/cell = 0 body_parts_covered = HANDS diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 0833dcd4e59..0a8390c33b7 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -10,7 +10,6 @@ updateicon() /obj/item/weapon/cell/proc/updateicon() - overlays = null if(charge < 0.01) @@ -68,34 +67,8 @@ call(/obj/item/clothing/gloves/space_ninja/proc/drain)("CELL",src,user:wear_suit) return -//Just because someone gets you occasionally with stun gloves doesn't mean you can put in code to kill everyone who tries to make some. /obj/item/weapon/cell/attackby(obj/item/W, mob/user) ..() -//HONK HONK GLOVES NERF -Pete -/* - var/obj/item/clothing/gloves/G = W - if(istype(G)) - // var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread - // s.set_up(3, 1, src) - // s.start() - // if (prob(80+(G.siemens_coefficient*100)) && electrocute_mob(user, src, src)) - // return 1 - if(!istype(W, /obj/item/clothing/gloves/yellow)) - if(!G.wired) - user << "You run an electrical current through the gloves, but nothing happens!" - return - - if(charge < 1000) - return - - // G.siemens_coefficient = max(G.siemens_coefficient,0.3) - G.elecgen = 1 - G.uses = min(5, round(charge / 1000)) - use(G.uses*1000) - updateicon() - user << "\red These gloves are now electrically charged!" -*/ - if(istype(W, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = W diff --git a/icons/effects/water.dmi b/icons/effects/water.dmi index 33af95aff1a..1cc75401fda 100644 Binary files a/icons/effects/water.dmi and b/icons/effects/water.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 4c0bbac2705..d22ca7c0f59 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5,203 +5,6 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/ATMOSPHERICS" -#define FILE_DIR "code/ATMOSPHERICS/components" -#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/unary" -#define FILE_DIR "code/datums" -#define FILE_DIR "code/datums/diseases" -#define FILE_DIR "code/datums/helper_datums" -#define FILE_DIR "code/datums/spells" -#define FILE_DIR "code/defines" -#define FILE_DIR "code/defines/area" -#define FILE_DIR "code/defines/mob" -#define FILE_DIR "code/defines/mob/dead" -#define FILE_DIR "code/defines/mob/living" -#define FILE_DIR "code/defines/mob/living/carbon" -#define FILE_DIR "code/defines/mob/living/silicon" -#define FILE_DIR "code/defines/obj" -#define FILE_DIR "code/defines/procs" -#define FILE_DIR "code/defines/tanning" -#define FILE_DIR "code/FEA" -#define FILE_DIR "code/game" -#define FILE_DIR "code/game/area" -#define FILE_DIR "code/game/asteroid" -#define FILE_DIR "code/game/gamemodes" -#define FILE_DIR "code/game/gamemodes/blob" -#define FILE_DIR "code/game/gamemodes/blob/blobs" -#define FILE_DIR "code/game/gamemodes/changeling" -#define FILE_DIR "code/game/gamemodes/cult" -#define FILE_DIR "code/game/gamemodes/events" -#define FILE_DIR "code/game/gamemodes/events/holidays" -#define FILE_DIR "code/game/gamemodes/extended" -#define FILE_DIR "code/game/gamemodes/malfunction" -#define FILE_DIR "code/game/gamemodes/meteor" -#define FILE_DIR "code/game/gamemodes/nuclear" -#define FILE_DIR "code/game/gamemodes/revolution" -#define FILE_DIR "code/game/gamemodes/sandbox" -#define FILE_DIR "code/game/gamemodes/traitor" -#define FILE_DIR "code/game/gamemodes/wizard" -#define FILE_DIR "code/game/jobs" -#define FILE_DIR "code/game/jobs/job" -#define FILE_DIR "code/game/machinery" -#define FILE_DIR "code/game/machinery/atmoalter" -#define FILE_DIR "code/game/machinery/bots" -#define FILE_DIR "code/game/machinery/computer" -#define FILE_DIR "code/game/machinery/doors" -#define FILE_DIR "code/game/machinery/embedded_controller" -#define FILE_DIR "code/game/machinery/kitchen" -#define FILE_DIR "code/game/machinery/pipe" -#define FILE_DIR "code/game/machinery/telecomms" -#define FILE_DIR "code/game/magic" -#define FILE_DIR "code/game/magic/cultist" -#define FILE_DIR "code/game/mecha" -#define FILE_DIR "code/game/mecha/combat" -#define FILE_DIR "code/game/mecha/equipment" -#define FILE_DIR "code/game/mecha/equipment/tools" -#define FILE_DIR "code/game/mecha/equipment/weapons" -#define FILE_DIR "code/game/mecha/medical" -#define FILE_DIR "code/game/mecha/working" -#define FILE_DIR "code/game/objects" -#define FILE_DIR "code/game/objects/alien" -#define FILE_DIR "code/game/objects/closets" -#define FILE_DIR "code/game/objects/closets/secure" -#define FILE_DIR "code/game/objects/devices" -#define FILE_DIR "code/game/objects/devices/PDA" -#define FILE_DIR "code/game/objects/grenades" -#define FILE_DIR "code/game/objects/items" -#define FILE_DIR "code/game/objects/items/weapons" -#define FILE_DIR "code/game/objects/items/weapons/implants" -#define FILE_DIR "code/game/objects/radio" -#define FILE_DIR "code/game/objects/secstorage" -#define FILE_DIR "code/game/objects/stacks" -#define FILE_DIR "code/game/objects/storage" -#define FILE_DIR "code/game/objects/tanks" -#define FILE_DIR "code/game/vehicles" -#define FILE_DIR "code/game/vehicles/airtight" -#define FILE_DIR "code/game/verbs" -#define FILE_DIR "code/js" -#define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/admin" -#define FILE_DIR "code/modules/admin/DB ban" -#define FILE_DIR "code/modules/admin/verbs" -#define FILE_DIR "code/modules/assembly" -#define FILE_DIR "code/modules/chemical" -#define FILE_DIR "code/modules/client" -#define FILE_DIR "code/modules/clothing" -#define FILE_DIR "code/modules/clothing/glasses" -#define FILE_DIR "code/modules/clothing/gloves" -#define FILE_DIR "code/modules/clothing/head" -#define FILE_DIR "code/modules/clothing/masks" -#define FILE_DIR "code/modules/clothing/shoes" -#define FILE_DIR "code/modules/clothing/spacesuits" -#define FILE_DIR "code/modules/clothing/suits" -#define FILE_DIR "code/modules/clothing/under" -#define FILE_DIR "code/modules/clothing/uniforms" -#define FILE_DIR "code/modules/critters" -#define FILE_DIR "code/modules/critters/hivebots" -#define FILE_DIR "code/modules/detectivework" -#define FILE_DIR "code/modules/flufftext" -#define FILE_DIR "code/modules/food" -#define FILE_DIR "code/modules/maps" -#define FILE_DIR "code/modules/mining" -#define FILE_DIR "code/modules/mob" -#define FILE_DIR "code/modules/mob/dead" -#define FILE_DIR "code/modules/mob/dead/observer" -#define FILE_DIR "code/modules/mob/living" -#define FILE_DIR "code/modules/mob/living/blob" -#define FILE_DIR "code/modules/mob/living/carbon" -#define FILE_DIR "code/modules/mob/living/carbon/alien" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste" -#define FILE_DIR "code/modules/mob/living/carbon/alien/larva" -#define FILE_DIR "code/modules/mob/living/carbon/brain" -#define FILE_DIR "code/modules/mob/living/carbon/human" -#define FILE_DIR "code/modules/mob/living/carbon/metroid" -#define FILE_DIR "code/modules/mob/living/carbon/monkey" -#define FILE_DIR "code/modules/mob/living/silicon" -#define FILE_DIR "code/modules/mob/living/silicon/ai" -#define FILE_DIR "code/modules/mob/living/silicon/decoy" -#define FILE_DIR "code/modules/mob/living/silicon/pai" -#define FILE_DIR "code/modules/mob/living/silicon/robot" -#define FILE_DIR "code/modules/mob/living/simple_animal" -#define FILE_DIR "code/modules/mob/new_player" -#define FILE_DIR "code/modules/mob/organ" -#define FILE_DIR "code/modules/paperwork" -#define FILE_DIR "code/modules/power" -#define FILE_DIR "code/modules/power/antimatter" -#define FILE_DIR "code/modules/power/singularity" -#define FILE_DIR "code/modules/power/singularity/particle_accelerator" -#define FILE_DIR "code/modules/projectiles" -#define FILE_DIR "code/modules/projectiles/ammunition" -#define FILE_DIR "code/modules/projectiles/guns" -#define FILE_DIR "code/modules/projectiles/guns/energy" -#define FILE_DIR "code/modules/projectiles/guns/projectile" -#define FILE_DIR "code/modules/projectiles/projectile" -#define FILE_DIR "code/modules/recycling" -#define FILE_DIR "code/modules/research" -#define FILE_DIR "code/modules/scripting" -#define FILE_DIR "code/modules/scripting/AST" -#define FILE_DIR "code/modules/scripting/AST/Operators" -#define FILE_DIR "code/modules/scripting/Implementations" -#define FILE_DIR "code/modules/scripting/Interpreter" -#define FILE_DIR "code/modules/scripting/Parser" -#define FILE_DIR "code/modules/scripting/Scanner" -#define FILE_DIR "code/modules/security levels" -#define FILE_DIR "code/unused" -#define FILE_DIR "code/unused/beast" -#define FILE_DIR "code/unused/computer2" -#define FILE_DIR "code/unused/disease2" -#define FILE_DIR "code/unused/gamemodes" -#define FILE_DIR "code/unused/hivebot" -#define FILE_DIR "code/unused/mining" -#define FILE_DIR "code/unused/optics" -#define FILE_DIR "code/unused/pda2" -#define FILE_DIR "code/unused/powerarmor" -#define FILE_DIR "code/unused/spacecraft" -#define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/carn" -#define FILE_DIR "code/WorkInProgress/mapload" -#define FILE_DIR "code/WorkInProgress/organs" -#define FILE_DIR "code/WorkInProgress/virus2" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vehicles" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "interface" -#define FILE_DIR "maps" -#define FILE_DIR "maps/RandomZLevels" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/weapons" -#define FILE_DIR "tools" -#define FILE_DIR "tools/Redirector" // END_FILE_DIR // BEGIN_PREFERENCES @@ -677,7 +480,6 @@ #include "code\game\objects\grenades\emgrenade.dm" #include "code\game\objects\grenades\flashbang.dm" #include "code\game\objects\grenades\grenade.dm" -#include "code\game\objects\grenades\mustardbomb.dm" #include "code\game\objects\grenades\smokebomb.dm" #include "code\game\objects\grenades\spawnergrenade.dm" #include "code\game\objects\items\apc_frame.dm"