From 3fbdc99079e877ded4bdc9ed14b8f58529c2f248 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 28 Aug 2013 03:33:04 +0100 Subject: [PATCH 01/18] Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. --- code/__HELPERS/logging.dm | 2 +- code/game/atoms.dm | 3 +- code/game/gamemodes/cult/ritual.dm | 4 +-- code/game/gamemodes/wizard/soulstone.dm | 4 +-- code/game/machinery/kitchen/gibber.dm | 2 +- code/game/objects/items.dm | 8 ++--- code/game/objects/items/devices/aicard.dm | 3 +- code/game/objects/items/devices/flash.dm | 4 +-- code/game/objects/items/robot/robot_items.dm | 3 +- .../objects/items/weapons/dna_injector.dm | 7 ++-- code/game/objects/items/weapons/explosives.dm | 4 +-- .../objects/items/weapons/gift_wrappaper.dm | 4 +-- .../items/weapons/grenades/chem_grenade.dm | 8 ++--- .../objects/items/weapons/grenades/grenade.dm | 4 +-- code/game/objects/items/weapons/handcuffs.dm | 4 +-- .../game/objects/items/weapons/hydroponics.dm | 4 +-- .../items/weapons/implants/implanter.dm | 3 +- code/game/objects/items/weapons/kitchen.dm | 7 ++-- .../items/weapons/storage/briefcase.dm | 3 +- code/game/objects/items/weapons/stunbaton.dm | 12 +++++-- .../objects/items/weapons/swords_axes_etc.dm | 2 +- code/game/objects/items/weapons/weaponry.dm | 2 +- code/modules/admin/admin.dm | 4 +-- code/modules/mob/living/carbon/carbon.dm | 3 +- .../living/carbon/human/human_attackhand.dm | 8 ++--- .../mob/living/carbon/human/inventory.dm | 36 +++++++++++++++++++ code/modules/mob/living/living_defense.dm | 3 +- code/modules/mob/mob_grab.dm | 4 +-- code/modules/paperwork/pen.dm | 5 ++- code/modules/projectiles/projectile.dm | 6 ++-- code/modules/reagents/dartgun.dm | 10 +++--- .../reagents/reagent_containers/dropper.dm | 15 ++++---- .../reagent_containers/food/condiment.dm | 3 +- .../reagent_containers/food/drinks.dm | 3 +- .../reagent_containers/food/drinks/bottle.dm | 2 +- .../reagent_containers/food/snacks.dm | 3 +- .../reagents/reagent_containers/glass.dm | 16 ++++----- .../reagents/reagent_containers/hypospray.dm | 5 ++- .../reagents/reagent_containers/pill.dm | 3 +- .../reagent_containers/robodropper.dm | 14 ++++---- .../reagents/reagent_containers/syringes.dm | 11 ++++-- code/modules/reagents/syringe_gun.dm | 4 +-- code/modules/recycling/disposal.dm | 9 +++-- code/modules/surgery/braincore.dm | 5 +-- 44 files changed, 145 insertions(+), 124 deletions(-) diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm index 8a5b496328e..3519417dd78 100644 --- a/code/__HELPERS/logging.dm +++ b/code/__HELPERS/logging.dm @@ -55,7 +55,7 @@ /proc/log_attack(text) if (config.log_attack) - diaryofmeanpeople << "\[[time_stamp()]]ATTACK: [text]" + diary << "\[[time_stamp()]]ATTACK: [text]" //Seperate attack logs? Why? /proc/log_adminsay(text) if (config.log_adminchat) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 784ba44c188..b8e9f1799f3 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -26,7 +26,8 @@ var/mob/living/M = hit_atom M.hitby(src,speed) - log_attack("[hit_atom] ([M.ckey]) was hit by [src] thrown by ([src.fingerprintslast])") + M.attack_log += text("\[[time_stamp()]\] Has been hit with [src], last touched by [src.fingerprintslast]") + msg_admin_attack("[hit_atom] ([M.ckey]) was hit by [src] last touched by ([src.fingerprintslast]) (JMP)") else if(isobj(hit_atom)) var/obj/O = hit_atom diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 8e3a0e0251b..2d408a1a4ff 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -338,10 +338,10 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // usr << browse(null, "window=tank") attack(mob/living/M as mob, mob/living/user as mob) + M.attack_log += text("\[[time_stamp()]\] Has had the [name] used on him by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used [name] on [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) used [name] on [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) used [name] on [M.name] ([M.ckey]) (JMP)") if(istype(M,/mob/dead)) M.invisibility = 0 diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 90d48fb8409..70c655ce576 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -18,10 +18,10 @@ return ..() if(istype(M, /mob/living/carbon/human/dummy)) return..() + M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) used the [src.name] to capture the soul of [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to capture the soul of [M.name] ([M.ckey]) (JMP)") transfer_soul("VICTIM", M, user) return diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 0a8bde59dde..5441576b20b 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -155,7 +155,7 @@ src.occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [user]/[user.ckey]" //One shall not simply gib a mob unnoticed! user.attack_log += "\[[time_stamp()]\] Gibbed [src.occupant]/[src.occupant.ckey]" - log_attack("\[[time_stamp()]\] [user]/[user.ckey] gibbed [src.occupant]/[src.occupant.ckey]") + msg_admin_attack("[user.name] ([user.ckey]) gibbed [src.occupant] ([src.occupant.ckey]) (JMP)") src.occupant.death(1) src.occupant.ghostize() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c55684eb197..21936e52f11 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -224,10 +224,9 @@ user.lastattacked = M M.lastattacker = user - user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" - log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" ) - msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") //BS12 EDIT ALG + user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" + msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)]) (JMP)") //BS12 EDIT ALG //spawn(1800) // this wont work right // M.lastattacker = null @@ -646,8 +645,7 @@ user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" - msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") //BS12 EDIT ALG - log_attack(" [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") //BS12 EDIT ALG src.add_fingerprint(user) //if((CLUMSY in user.mutations) && prob(50)) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 810bb7f4efc..43daf35b323 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -16,8 +16,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been carded with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to card [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) used the [src.name] to card [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to card [M.name] ([M.ckey]) (JMP)") transfer_ai("AICORE", "AICARD", M, user) return diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 119f0568139..41565dbe63b 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -34,10 +34,10 @@ /obj/item/device/flash/attack(mob/living/M as mob, mob/user as mob) if(!user || !M) return //sanity + M.attack_log += text("\[[time_stamp()]\] Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to flash [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [M.name] ([M.ckey]) (JMP)") if(!clown_check(user)) return if(broken) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index d6f18c57e76..8021570b220 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -12,8 +12,7 @@ attack(mob/M as mob, mob/living/silicon/robot/user as mob) M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") - - log_attack(" [user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey]) (JMP)") user.cell.charge -= 30 diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index a58629cda96..5bf10ccd20e 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -66,10 +66,10 @@ if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") user << "\red You don't have the dexterity to do this!" return + M.attack_log += text("\[[time_stamp()]\] Has been injected with [name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [name] to inject [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) used the [name] to inject [M.name] ([M.ckey])") + log_attack("[user.name] ([user.ckey]) used the [name] to inject [M.name] ([M.ckey])") if (user) if (istype(M, /mob/living/carbon/human)) @@ -87,8 +87,7 @@ M.requests += O if (dnatype == "se") if (isblockon(getblock(dna, 14,3),14) && istype(M, /mob/living/carbon/human)) - message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)") - log_attack("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)") + msg_admin_attack("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY) (JMP)") else // message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]") log_attack("[key_name(user)] injected [key_name(M)] with the [name]") diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 4f35194f9d2..3c4f97c130d 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -13,11 +13,9 @@ user << "Planting explosives..." if(ismob(target)) user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])" - log_attack(" [user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey])") + msg_admin_attack("[user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey]) (JMP)") user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!") - log_attack("ATTACK: [user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey])") - if(do_after(user, 50) && in_range(user, target)) user.drop_item() target = target diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index e15ce7fc8c8..afd63497073 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -182,10 +182,10 @@ H.client.eye = present H.loc = present + H.attack_log += text("\[[time_stamp()]\] Has been wrapped with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to wrap [H.name] ([H.ckey])") - - log_attack("[user.name] ([user.ckey]) used the [src.name] to wrap [H.name] ([H.ckey])") + log_attack("[user.name] ([user.ckey]) used the [src.name] to wrap [H.name] ([H.ckey])") else user << "\blue You need more paper." diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 0c075c5725a..f70aca0c29d 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -36,9 +36,7 @@ if(stage > 1 && !active && clown_check(user)) user << "You prime \the [name]!" - log_attack("[user.name] ([user.ckey]) primed \a [src].") - log_admin("ATTACK: [user] ([user.ckey]) primed \a [src].") - message_admins("ATTACK: [user] ([user.ckey]) primed \a [src].") + msg_admin_attack("[user.name] ([user.ckey]) primed \a [src]. (JMP)") activate() add_fingerprint(user) @@ -126,9 +124,7 @@ icon_state = initial(icon_state) + "_active" if(user) - log_attack("[user.name] ([user.ckey]) primed \a [src]") - log_admin("ATTACK: [user] ([user.ckey]) primed \a [src]") - message_admins("ATTACK: [user] ([user.ckey]) primed \a [src]") + msg_admin_attack("[user.name] ([user.ckey]) primed \a [src] (JMP)") return diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 99466a9d2a3..93f93c5e4b6 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -69,9 +69,7 @@ return if(user) - log_attack("[user.name] ([user.ckey]) primed \a [src]") - log_admin("ATTACK: [user] ([user.ckey]) primed \a [src]") - message_admins("ATTACK: [user] ([user.ckey]) primed \a [src]") + msg_admin_attack("[user.name] ([user.ckey]) primed \a [src] (JMP)") icon_state = initial(icon_state) + "_active" active = 1 diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index e95338168d2..80b3403a9be 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -51,10 +51,10 @@ return if (istype(C, /mob/living/carbon/human)) if(!C.handcuffed) + C.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [C.name] ([C.ckey])") - - log_attack("[user.name] ([user.ckey]) Attempted to handcuff [C.name] ([C.ckey])") + log_attack("[user.name] ([user.ckey]) Attempted to handcuff [C.name] ([C.ckey])") var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human( ) O.source = user diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index daebf114d2f..b18766b09ad 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -178,10 +178,10 @@ if(!..()) return if(istype(M, /mob/living)) M << "\red You are stunned by the powerful acid of the Deathnettle!" + M.attack_log += text("\[[time_stamp()]\] Had the [src.name] used on them by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] on [M.name] ([M.ckey])") - - log_attack(" [user.name] ([user.ckey]) used the [src.name] on [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] on [M.name] ([M.ckey]) (JMP)") playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 785997a3db8..28eeaaf5b8a 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -31,9 +31,10 @@ if(user && M && (get_turf(M) == T1) && src && src.imp) for (var/mob/O in viewers(M, null)) O.show_message("\red [M] has been implanted by [user].", 1) + M.attack_log += text("\[[time_stamp()]\] Implanted with [src.name] ([src.imp.name]) by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] ([src.imp.name]) to implant [M.name] ([M.ckey])") - log_attack("[user.name] ([user.ckey]) implanted [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("[user.name] ([user.ckey]) implanted [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") user.show_message("\red You implanted the implant into [M].") if(src.imp.implanted(M)) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 6fbdba918ed..d70c2615aaf 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -218,10 +218,10 @@ user.take_organ_damage(10) user.Paralyse(2) return + M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey]) (JMP)") var/t = user:zone_sel.selecting if (t == "head") @@ -318,8 +318,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey]) (JMP)") if(prob(15)) M.Weaken(3) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index add00298877..6fa791782d7 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -25,8 +25,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (?)") if (M.stat < 2 && M.health < 50 && prob(90)) var/mob/H = M diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index bac563a0715..5d6bd479c47 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -62,6 +62,11 @@ if(!..()) return //H.apply_effect(5, WEAKEN, 0) H.visible_message("[M] has been beaten with the [src] by [user]!") + + user.attack_log += "\[[time_stamp()]\] Beat [H.name] ([H.ckey]) with [src.name]" + H.attack_log += "\[[time_stamp()]\] Beaten by [user.name] ([user.ckey]) with [src.name]" + msg_admin_attack("[user.name] ([user.ckey]) beat [H.name] ([H.ckey]) with [src.name] (JMP)") + playsound(src.loc, "swing_hit", 50, 1, -1) else if(!status) H.visible_message("[M] has been prodded with the [src] by [user]. Luckily it was off.") @@ -80,9 +85,10 @@ else charges-- H.visible_message("[M] has been stunned with the [src] by [user]!") + user.attack_log += "\[[time_stamp()]\] Stunned [H.name] ([H.ckey]) with [src.name]" H.attack_log += "\[[time_stamp()]\] Stunned by [user.name] ([user.ckey]) with [src.name]" - log_attack("[user.name] ([user.ckey]) stunned [H.name] ([H.ckey]) with [src.name]" ) + log_attack("[user.name] ([user.ckey]) stunned [H.name] ([H.ckey]) with [src.name]") playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) if(charges < 1) @@ -107,8 +113,8 @@ H.visible_message("[src], thrown by [foundmob.name], strikes [H] and stuns them!") - H.attack_log += "\[[time_stamp()]\] Stunned by thrown [src.name] (([src.fingerprintslast]))" - log_attack("Flying [src.name], thrown by ([src.fingerprintslast]) stunned [H.name] ([H.ckey])" ) + H.attack_log += "\[[time_stamp()]\] Stunned by thrown [src.name] last touched by ([src.fingerprintslast])" + log_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [H.name] ([H.ckey])" ) return return ..() diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 60ea8312450..4e8f0bd8216 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -97,7 +97,7 @@ M.Weaken(5) M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") - log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") src.add_fingerprint(user) for(var/mob/O in viewers(M)) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 92e6b78d754..530246ccf76 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -39,7 +39,7 @@ log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") - log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") user << "\red You don't have the dexterity to do this!" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index bb1717a8f55..f2b02d9f293 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -12,8 +12,8 @@ var/global/floorIsLava = 0 C << msg /proc/msg_admin_attack(var/text) //Toggleable Attack Messages - var/rendered = "ADMIN LOG: [text]" - log_adminwarn(rendered) + log_attack(text) + var/rendered = "ATTACK: [text]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) if(C.prefs.toggles & CHAT_ATTACKLOGS) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 061f06fe7d8..d9d6fdc070b 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -371,8 +371,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]") usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]") - - log_attack("[usr.name] ([usr.ckey]) Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]") + msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (JMP)") if(!item) return //Grab processing has a chance of returning null diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index cb161b9d944..73f0a354c12 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -27,7 +27,7 @@ M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])") - log_attack("[M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])") + msg_admin_attack("[M.name] ([M.ckey]) stungloved [src.name] ([src.ckey]) (JMP)") var/armorblock = run_armor_check(M.zone_sel.selecting, "energy") apply_effects(5,5,0,0,5,0,0,armorblock) @@ -106,7 +106,7 @@ M.attack_log += text("\[[time_stamp()]\] [M.species.attack_verb]ed [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been [M.species.attack_verb]ed by [M.name] ([M.ckey])") - log_attack("[M.name] ([M.ckey]) [M.species.attack_verb]ed [src.name] ([src.ckey])") + log_attack("[M.name] ([M.ckey]) [M.species.attack_verb]ed [src.name] ([src.ckey])") var/damage = rand(0, 5)//BS12 EDIT if(!damage) @@ -144,9 +144,7 @@ M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])") - log_admin("ATTACK: [M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])") - log_attack("[M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])") - + log_attack("[M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])") if(w_uniform) w_uniform.add_fingerprint(M) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 8e5938fffdf..9c71f2efddf 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -372,60 +372,88 @@ if("dnainjector") message = "\red [source] is trying to inject [target] with the [item]!" if("mask") + target.attack_log += text("\[[time_stamp()]\] Had their mask removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) mask") if(target.wear_mask && !target.wear_mask.canremove) message = "\red [source] fails to take off \a [target.wear_mask] from [target]'s head!" return else message = "\red [source] is trying to take off \a [target.wear_mask] from [target]'s head!" if("l_hand") + target.attack_log += text("\[[time_stamp()]\] Has had their left hand item ([target.l_hand]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) left hand item ([target.l_hand])") message = "\red [source] is trying to take off \a [target.l_hand] from [target]'s left hand!" if("r_hand") + target.attack_log += text("\[[time_stamp()]\] Has had their right hand item ([target.r_hand]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) right hand item ([target.r_hand])") message = "\red [source] is trying to take off \a [target.r_hand] from [target]'s right hand!" if("gloves") + target.attack_log += text("\[[time_stamp()]\] Has had their gloves ([target.gloves]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) gloves ([target.gloves])") if(target.gloves && !target.gloves.canremove) message = "\red [source] fails to take off \a [target.gloves] from [target]'s hands!" return else message = "\red [source] is trying to take off the [target.gloves] from [target]'s hands!" if("eyes") + target.attack_log += text("\[[time_stamp()]\] Has had their eyewear ([target.glasses]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) eyewear ([target.glasses])") if(target.glasses && !target.glasses.canremove) message = "\red [source] fails to take off \a [target.glasses] from [target]'s eyes!" return else message = "\red [source] is trying to take off the [target.glasses] from [target]'s eyes!" if("ears") + target.attack_log += text("\[[time_stamp()]\] Has had their ear item ([target.ears]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) ear item ([target.ears])") if(target.ears && !target.ears.canremove) message = "\red [source] fails to take off \a [target.ears] from [target]'s ears!" return else message = "\red [source] is trying to take off the [target.ears] from [target]'s ears!" if("head") + target.attack_log += text("\[[time_stamp()]\] Has had their hat ([target.head]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) hat ([target.head])") if(target.head && !target.head.canremove) message = "\red [source] fails to take off \a [target.head] from [target]'s head!" return else message = "\red [source] is trying to take off the [target.head] from [target]'s head!" if("shoes") + target.attack_log += text("\[[time_stamp()]\] Has had their shoes ([target.shoes]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) shoes ([target.shoes])") if(target.shoes && !target.shoes.canremove) message = "\red [source] fails to take off \a [target.shoes] from [target]'s feet!" return else message = "\red [source] is trying to take off the [target.shoes] from [target]'s feet!" if("belt") + target.attack_log += text("\[[time_stamp()]\] Has had their belt item ([target.belt]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) belt item ([target.belt])") message = "\red [source] is trying to take off the [target.belt] from [target]'s belt!" if("suit") + target.attack_log += text("\[[time_stamp()]\] Has had their suit ([target.wear_suit]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) suit ([target.wear_suit])") if(target.wear_suit && !target.wear_suit.canremove) message = "\red [source] fails to take off \a [target.wear_suit] from [target]'s body!" return else message = "\red [source] is trying to take off \a [target.wear_suit] from [target]'s body!" if("back") + target.attack_log += text("\[[time_stamp()]\] Has had their back item ([target.back]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) back item ([target.back])") message = "\red [source] is trying to take off \a [target.back] from [target]'s back!" if("handcuff") + target.attack_log += text("\[[time_stamp()]\] Was unhandcuffed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to unhandcuff [target.name]'s ([target.ckey])") message = "\red [source] is trying to unhandcuff [target]!" if("legcuff") + target.attack_log += text("\[[time_stamp()]\] Was unlegcuffed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to unlegcuff [target.name]'s ([target.ckey])") message = "\red [source] is trying to unlegcuff [target]!" if("uniform") + target.attack_log += text("\[[time_stamp()]\] Has had their uniform ([target.w_uniform]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) uniform ([target.w_uniform])") for(var/obj/item/I in list(target.l_store, target.r_store)) if(I.on_found(source)) return @@ -435,8 +463,12 @@ else message = "\red [source] is trying to take off \a [target.w_uniform] from [target]'s body!" if("s_store") + target.attack_log += text("\[[time_stamp()]\] Has had their suit storage item ([target.s_store]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) suit storage item ([target.s_store])") message = "\red [source] is trying to take off \a [target.s_store] from [target]'s suit!" if("pockets") + target.attack_log += text("\[[time_stamp()]\] Has had their pockets emptied by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to empty [target.name]'s ([target.ckey]) pockets") for(var/obj/item/I in list(target.l_store, target.r_store)) if(I.on_found(source)) return @@ -447,8 +479,12 @@ target.cpr_time = 0 message = "\red [source] is trying perform CPR on [target]!" if("id") + target.attack_log += text("\[[time_stamp()]\] Has had their ID ([target.wear_id]) removed by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to remove [target.name]'s ([target.ckey]) ID ([target.wear_id])") message = "\red [source] is trying to take off [target.wear_id] from [target]'s uniform!" if("internal") + target.attack_log += text("\[[time_stamp()]\] Has had their internals toggled by [source.name] ([source.ckey])") + source.attack_log += text("\[[time_stamp()]\] Attempted to toggle [target.name]'s ([target.ckey]) internals") if (target.internal) message = "\red [source] is trying to remove [target]'s internals" else diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index b7ba0a78037..dbe8cc268ef 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -80,9 +80,10 @@ var/client/assailant = directory[ckey(O.fingerprintslast)] if(assailant && assailant.mob && istype(assailant.mob,/mob)) var/mob/M = assailant.mob + src.attack_log += text("\[[time_stamp()]\] Has been hit with [O], last touched by [M.name] ([assailant.ckey])") M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with [O]") - log_attack("[src.name] ([src.ckey]) was hit by [O], last touched by [M.name] ([assailant.ckey])") + msg_admin_attack("[src.name] ([src.ckey]) was hit by [O], last touched by [M.name] ([assailant.ckey]) (JMP)") // Begin BS12 momentum-transfer code. diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 5363c05a116..d716e537e61 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -211,7 +211,7 @@ affecting.loc = assailant.loc affecting.attack_log += text("\[[time_stamp()]\] Has had their neck grabbed by [assailant.name] ([assailant.ckey])") assailant.attack_log += text("\[[time_stamp()]\] Grabbed the neck of [affecting.name] ([affecting.ckey])") - log_attack("[assailant.name] ([assailant.ckey]) grabbed the neck of [affecting.name] ([affecting.ckey])") + msg_admin_attack("[assailant.name] ([assailant.ckey]) grabbed the neck of [affecting.name] ([affecting.ckey]) (JMP)") hud1.icon_state = "disarm/kill" hud1.name = "disarm/kill" else @@ -233,7 +233,7 @@ assailant.visible_message("\red [assailant] has tightened \his grip on [affecting]'s neck!") affecting.attack_log += text("\[[time_stamp()]\] Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])") assailant.attack_log += text("\[[time_stamp()]\] Strangled (kill intent) [affecting.name] ([affecting.ckey])") - log_attack("[assailant.name] ([assailant.ckey]) Strangled (kill intent) [affecting.name] ([affecting.ckey])") + msg_admin_attack("[assailant.name] ([assailant.ckey]) Strangled (kill intent) [affecting.name] ([affecting.ckey]) (JMP)") assailant.next_move = world.time + 10 affecting.losebreath += 1 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 43eb2e40e28..2548c764ecf 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -46,11 +46,10 @@ if(!ismob(M)) return user << "You stab [M] with the pen." - M << "\red You feel a tiny prick!" +// M << "\red You feel a tiny prick!" //That's a whole lot of meta! M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") - - log_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (JMP)") return diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 8f2ea173cf8..083e10cb5f4 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -107,12 +107,10 @@ if(istype(firer, /mob)) M.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src.type]" firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src.type]" - log_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]") - msg_admin_attack("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG + msg_admin_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src] (JMP)") //BS12 EDIT ALG else M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a [src]" - log_attack("UNKNOWN shot [M] ([M.ckey]) with a [src.type]") - msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG + msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src] (JMP)") //BS12 EDIT ALG spawn(0) diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index e89792c62c6..33e29dc809f 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -177,13 +177,13 @@ R += A.id + " (" R += num2text(A.volume) + ")," if (istype(M, /mob)) - M.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a syringegun ([R])" - user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a syringegun ([R])" - log_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R])") + M.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a dartgun ([R])" + user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a dartgun ([R])" + msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a dartgun ([R]) (JMP)") else - M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a syringegun ([R])" - log_attack("UNKNOWN shot [M] ([M.ckey]) with a syringegun ([R])") + M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a dartgun ([R])" + msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a dartgun ([R]) (JMP)") if(D.reagents) D.reagents.trans_to(M, 15) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 22ea087b13f..7455e8118be 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -63,15 +63,12 @@ for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] squirts something into []'s eyes!", user, target), 1) src.reagents.reaction(target, TOUCH) - var/mob/M = target - var/R - if(src.reagents) - for(var/datum/reagent/A in src.reagents.reagent_list) - R += A.id + " (" - R += num2text(A.volume) + ")," - user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] squirted [M]/[M.ckey] with ([R])" - M.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] squirted [M]/[M.ckey] with ([R])" - log_attack("\[[time_stamp()]\] [user]/[user.ckey] squirted [M]/[M.ckey] with ([R])") + + var/mob/living/M = target + var/contained = english_list(src.reagents) + M.attack_log += text("\[[time_stamp()]\] Has been squirted ([contained]) with [src.name] by [user.name] ([user.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to squirt [M.name] ([M.key]) with [contained]") + msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You transfer [trans] units of the solution." diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index e360062fec0..9d16f0b356f 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -45,8 +45,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]") user.attack_log += text("\[[time_stamp()]\] Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]") - - log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("ATTACK: [user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") if(reagents.total_volume) reagents.reaction(M, INGEST) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index dfa67cdef29..66a1b3e343e 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -45,8 +45,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]") user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]") - - log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (JMP)") if(reagents.total_volume) reagents.reaction(M, INGEST) diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 36016e92c14..c958b351fa5 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -99,7 +99,7 @@ //Attack logs user.attack_log += text("\[[time_stamp()]\] Has attacked [target.name] ([target.ckey]) with a bottle!") target.attack_log += text("\[[time_stamp()]\] Has been smashed with a bottle by [user.name] ([user.ckey])") - log_attack("[user.name] ([user.ckey]) attacked [target.name] with a bottle. ([target.ckey])") + msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with a bottle. (INTENT: [uppertext(user.a_intent)]) (JMP)") //The reagents in the bottle splash all over the target, thanks for the idea Nodrak if(src.reagents) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index f15c3410947..664a4363442 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -66,8 +66,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]") user.attack_log += text("\[[time_stamp()]\] Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]") - - log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)])") for(var/mob/O in viewers(world.view, user)) O.show_message("\red [user] feeds [M] [src].", 1) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 9c8b004c479..79c64304d51 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -72,16 +72,14 @@ return if(ismob(target) && target.reagents && reagents.total_volume) - var/mob/M = target user << "\blue You splash the solution onto [target]." - var/R - if(src.reagents) - for(var/datum/reagent/A in src.reagents.reagent_list) - R += A.id + " (" - R += num2text(A.volume) + ")," - user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] splashed [M]/[M.ckey] with ([R])" - M.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] splashed [M]/[M.ckey] with ([R])" - log_attack("\[[time_stamp()]\] [user]/[user.ckey] splashed [M]/[M.ckey] with ([R])") + + var/mob/living/M = target + var/contained = english_list(src.reagents) + M.attack_log += text("\[[time_stamp()]\] Has been splashed ([contained]) with [src.name] by [user.name] ([user.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to splash [M.name] ([M.key]) with [contained]") + msg_admin_attack("[user.name] ([user.ckey]) splashed [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] has been splashed with something by []!", target, user), 1) src.reagents.reaction(target, TOUCH) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 0b4a3c1e7e9..bdecdece517 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -44,10 +44,9 @@ user << "\blue [trans] units injected. [reagents.total_volume] units remaining in [src]." var/contained = english_list(injected) - - log_attack("[user.name] ([user.ckey]) injected [M.name] ([M.ckey]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)])") M.attack_log += text("\[[time_stamp()]\] Has been injected ([contained]) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.ckey]) with [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.key]) with [contained]") + msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") return diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 0f89ad73488..3c4bbcdb7de 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -43,8 +43,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]") user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]") - - log_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (JMP)") if(reagents.total_volume) reagents.reaction(M, INGEST) diff --git a/code/modules/reagents/reagent_containers/robodropper.dm b/code/modules/reagents/reagent_containers/robodropper.dm index a42d588f4ba..4b199d2011c 100644 --- a/code/modules/reagents/reagent_containers/robodropper.dm +++ b/code/modules/reagents/reagent_containers/robodropper.dm @@ -61,15 +61,13 @@ for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] squirts something into []'s eyes!", user, target), 1) src.reagents.reaction(target, TOUCH) + var/mob/M = target - var/R - if(src.reagents) - for(var/datum/reagent/A in src.reagents.reagent_list) - R += A.id + " (" - R += num2text(A.volume) + ")," - user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] squirted [M]/[M.ckey] with ([R])" - M.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] squirted [M]/[M.ckey] with ([R])" - log_attack("\[[time_stamp()]\] [user]/[user.ckey] squirted [M]/[M.ckey] with ([R])") + var/contained = english_list(src.reagents) + M.attack_log += text("\[[time_stamp()]\] Has been squirted ([contained]) with [src.name] by [user.name] ([user.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to squirt [M.name] ([M.key]) with [contained]") + msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You transfer [trans] units of the solution." diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 38e9c6f6882..1aba4f49343 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -145,6 +145,14 @@ for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] injects [] with the syringe!", user, target), 1) + + if(istype(target,/mob/living)) + var/mob/living/M = target + var/contained = english_list(src.reagents) + M.attack_log += text("\[[time_stamp()]\] Has been injected ([contained]) with [src.name] by [user.name] ([user.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.key]) with [contained]") + msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + src.reagents.reaction(target, INGEST) if(ismob(target) && target == user) src.reagents.reaction(target, INGEST) @@ -197,8 +205,7 @@ user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" - - log_attack(" [user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") if(istype(target, /mob/living/carbon/human)) diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm index eaa372bd45d..2600d11676c 100644 --- a/code/modules/reagents/syringe_gun.dm +++ b/code/modules/reagents/syringe_gun.dm @@ -87,11 +87,11 @@ if (istype(M, /mob)) M.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a syringegun ([R])" user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] shot [M]/[M.ckey] with a syringegun ([R])" - log_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R])") + msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R]) (JMP)") else M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a syringegun ([R])" - log_attack("UNKNOWN shot [M] ([M.ckey]) with a syringegun ([R])") + msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a syringegun ([R]) (JMP)") if(D.reagents) D.reagents.trans_to(M, 15) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 9f7d9f9c8ee..de028bd2967 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -114,7 +114,9 @@ for (var/mob/C in viewers(src)) C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3) del(G) - log_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.") + usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.") + GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])") + msg_admin_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit. (JMP)") return if(!I) return @@ -157,7 +159,10 @@ else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) msg = "[user.name] stuffs [target.name] into the [src]!" user << "You stuff [target.name] into the [src]!" - log_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") + + user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") + target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") + msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)") else return if (target.client) diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm index 977f90489ec..f4d81d37f59 100644 --- a/code/modules/surgery/braincore.dm +++ b/code/modules/surgery/braincore.dm @@ -87,10 +87,7 @@ user.attack_log += "\[[time_stamp()]\] Debrained [target.name] ([target.ckey]) with [tool.name] (INTENT: [uppertext(user.a_intent)])" target.attack_log += "\[[time_stamp()]\] Debrained by [user.name] ([user.ckey]) with [tool.name] (INTENT: [uppertext(user.a_intent)])" - - log_admin("ATTACK: [user] ([user.ckey]) debrained [target] ([target.ckey]) with [tool].") - message_admins("ATTACK: [user] ([user.ckey]) debrained [target] ([target.ckey]) with [tool].") - log_attack("[user.name] ([user.ckey]) debrained [target.name] ([target.ckey]) with [tool.name] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("[user.name] ([user.ckey]) debrained [target.name] ([target.ckey]) with [tool.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") var/obj/item/brain/B = new(target.loc) B.transfer_identity(target) From 0cb361f737c2b2224a0e40fa7ae33a7cc157bf1a Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 28 Aug 2013 03:37:11 +0100 Subject: [PATCH 02/18] Removed undeeded "ATTACK:" --- code/game/objects/items.dm | 4 ++-- code/game/objects/items/weapons/explosives.dm | 2 ++ code/game/objects/items/weapons/weaponry.dm | 2 -- code/modules/organs/organ_external.dm | 3 +-- code/modules/projectiles/projectile.dm | 2 +- code/modules/reagents/reagent_containers/food/condiment.dm | 2 +- code/modules/reagents/reagent_containers/syringes.dm | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 21936e52f11..7bea0644e74 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -226,7 +226,7 @@ M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" - msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)]) (JMP)") //BS12 EDIT ALG + msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)]) (JMP)") //BS12 EDIT ALG //spawn(1800) // this wont work right // M.lastattacker = null @@ -645,7 +645,7 @@ user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" - msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") //BS12 EDIT ALG + msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") //BS12 EDIT ALG src.add_fingerprint(user) //if((CLUMSY in user.mutations) && prob(50)) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 3c4f97c130d..d9a72058aee 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -12,8 +12,10 @@ return user << "Planting explosives..." if(ismob(target)) + user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])" msg_admin_attack("[user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey]) (JMP)") + user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!") if(do_after(user, 50) && in_range(user, target)) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 530246ccf76..922d9263766 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -37,8 +37,6 @@ M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") - log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") - message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index de037500009..7441ac88e1b 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -884,8 +884,7 @@ obj/item/weapon/organ/head/attackby(obj/item/weapon/W as obj, mob/user as mob) user.attack_log += "\[[time_stamp()]\] Debrained [brainmob.name] ([brainmob.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" brainmob.attack_log += "\[[time_stamp()]\] Debrained by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" - log_admin("ATTACK: [brainmob] ([brainmob.ckey]) debrained [user] ([user.ckey]).") - message_admins("ATTACK: [brainmob] ([brainmob.ckey]) debrained [user] ([user.ckey]).") + msg_admin_attack("[brainmob] ([brainmob.ckey]) debrained [user] ([user.ckey]) (INTENT: [uppertext(user.a_intent)]) (JMP)") var/obj/item/brain/B = new(loc) B.transfer_identity(brainmob) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 083e10cb5f4..c12f900bc02 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -110,7 +110,7 @@ msg_admin_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src] (JMP)") //BS12 EDIT ALG else M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a [src]" - msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src] (JMP)") //BS12 EDIT ALG + msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (JMP)") //BS12 EDIT ALG spawn(0) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 9d16f0b356f..73e44a85f02 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -45,7 +45,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]") user.attack_log += text("\[[time_stamp()]\] Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]") - msg_admin_attack("ATTACK: [user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") if(reagents.total_volume) reagents.reaction(M, INGEST) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 1aba4f49343..e36037ef254 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -205,7 +205,7 @@ user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" - msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") if(istype(target, /mob/living/carbon/human)) From 3557e12943e666e8809e58d50d17ae33782459c9 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 28 Aug 2013 12:49:23 +0100 Subject: [PATCH 03/18] Suits with shoes protect against glass shards. --- code/game/objects/items/stacks/sheets/glass.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 0169f5d894c..a7e6d57bb37 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -283,7 +283,7 @@ playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(!H.shoes) + if(!H.shoes && !(H.wear_suit.body_parts_covered & FEET)) var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) if(affecting.status & ORGAN_ROBOT) return From f0eecb3892cc7f7b11bf0afc011c9656b8c945ae Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 28 Aug 2013 13:16:30 +0100 Subject: [PATCH 04/18] Prison ID tag fix #3597 master version. --- maps/tgstation2.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 90d411b2343..cbed9685bb5 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -72,8 +72,8 @@ "abt" = (/obj/machinery/magnetic_module,/obj/structure/target_stake,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range) "abu" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/range) "abv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor/plating,/area/security/prison) -"abw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{id_tag = "Prsion"; name = "Prison Wing"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/prison) -"abx" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{id_tag = "Prsion"; name = "Prison Wing"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/prison) +"abw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{id_tag = "Prison"; name = "Prison Wing"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/prison) +"abx" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{id_tag = "Prison"; name = "Prison Wing"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/prison) "aby" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/security/prison) "abz" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/security/prison) "abA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table,/obj/item/weapon/storage/box/cups,/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/security/prison) From 8ee601aa9af945f8f263a02f76a10c13a690691b Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 28 Aug 2013 13:27:07 +0100 Subject: [PATCH 05/18] Fixes thermite runtimes. --- code/game/turfs/simulated/walls.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index f06eb81ba32..a8d73263661 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -337,10 +337,12 @@ O.density = 1 O.layer = 5 - var/turf/simulated/floor/F = ChangeTurf(/turf/simulated/floor/plating) + src.ChangeTurf(/turf/simulated/floor/plating) + + var/turf/simulated/floor/F = src F.burn_tile() F.icon_state = "wall_thermite" - user << "The thermite melts through the wall." + user << "The thermite starts melting through the wall." spawn(100) if(O) del(O) From 9fed22c056baaecd595680e732227a19da66e224 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Wed, 28 Aug 2013 18:49:00 +0100 Subject: [PATCH 06/18] Space no longer freezes mobs. Signed-off-by: Mloc-Argent --- code/game/turfs/space/space.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 57 ++++++++++---------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 95720295c87..4323ee0adb9 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -3,7 +3,7 @@ name = "\proper space" icon_state = "0" - temperature = TCMB + temperature = T0C thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT // heat_capacity = 700000 No. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d61cdd1cc7c..f5314954069 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -526,38 +526,37 @@ proc/handle_environment(datum/gas_mixture/environment) if(!environment) return - var/loc_temp = T0C - if(istype(loc, /obj/mecha)) - var/obj/mecha/M = loc - loc_temp = M.return_temperature() - else if(istype(get_turf(src), /turf/space)) - var/turf/heat_turf = get_turf(src) - loc_temp = heat_turf.temperature - else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) - loc_temp = loc:air_contents.temperature - else - loc_temp = environment.temperature + if(!istype(get_turf(src), /turf/space)) //space is not meant to change your body temperature. + var/loc_temp = T0C + if(istype(loc, /obj/mecha)) + var/obj/mecha/M = loc + loc_temp = M.return_temperature() + else if(istype(get_turf(src), /turf/space)) + else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) + loc_temp = loc:air_contents.temperature + else + loc_temp = environment.temperature - //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]" + //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]" - //Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit. - if(stat != 2) - stabilize_temperature_from_calories() + //Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit. + if(stat != 2) + stabilize_temperature_from_calories() -// log_debug("Adjusting to atmosphere.") - //After then, it reacts to the surrounding atmosphere based on your thermal protection - if(loc_temp < BODYTEMP_COLD_DAMAGE_LIMIT) //Place is colder than we are - var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 1) - var/amt = min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX) -// log_debug("[loc_temp] is Cold. Cooling by [amt]") - bodytemperature += amt - else if (loc_temp > BODYTEMP_HEAT_DAMAGE_LIMIT) //Place is hotter than we are - var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 1) - var/amt = min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX) -// log_debug("[loc_temp] is Heat. Heating up by [amt]") - bodytemperature += amt + // log_debug("Adjusting to atmosphere.") + //After then, it reacts to the surrounding atmosphere based on your thermal protection + if(loc_temp < BODYTEMP_COLD_DAMAGE_LIMIT) //Place is colder than we are + var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + if(thermal_protection < 1) + var/amt = min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX) + // log_debug("[loc_temp] is Cold. Cooling by [amt]") + bodytemperature += amt + else if (loc_temp > BODYTEMP_HEAT_DAMAGE_LIMIT) //Place is hotter than we are + var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + if(thermal_protection < 1) + var/amt = min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX) + // log_debug("[loc_temp] is Heat. Heating up by [amt]") + bodytemperature += amt // +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt. if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) From 8d1fdd87b3cd04903a361e043b4d3be1aa1a62d4 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 29 Aug 2013 02:24:40 +0300 Subject: [PATCH 07/18] Typecheck fix. --- code/game/mecha/mecha.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 63f4151779b..96789249fdf 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1574,7 +1574,7 @@ return if(href_list["dna_lock"]) if(usr != src.occupant) return - if(istype(src, /obj/item/device/mmi)) + if(istype(occupant, /mob/living/carbon/brain)) occupant_message("You are a brain. No.") return if(src.occupant) From 62c14facc472dcf6dd8ccc330a28db5f9954b789 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Thu, 29 Aug 2013 15:01:54 +0100 Subject: [PATCH 08/18] Moved atmospherics control computer into atmos proper. Signed-off-by: Mloc-Argent --- maps/tgstation2.dmm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index cbed9685bb5..e5638e26e74 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -5051,7 +5051,7 @@ "bTg" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/window/northleft{dir = 4; icon_state = "left"; name = "Engineering Desk"; req_access_txt = "32"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/engine/break_room) "bTh" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor,/area/engine/break_room) "bTi" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/engine/break_room) -"bTj" = (/obj/machinery/computer/atmoscontrol,/turf/simulated/floor,/area/engine/break_room) +"bTj" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r"; level = 2},/obj/machinery/power/apc{dir = 8; name = "Atmospherics APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/table,/obj/item/clothing/head/welding{pixel_x = 1; pixel_x = -5; pixel_y = 3},/obj/item/stack/sheet/glass{amount = 50},/obj/item/clothing/head/welding{pixel_x = 0; pixel_x = -5; pixel_y = 3},/obj/item/clothing/glasses/welding,/turf/simulated/floor,/area/atmos) "bTk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/device/t_scanner,/turf/simulated/floor,/area/engine/break_room) "bTl" = (/obj/machinery/computer/general_air_control{frequency = 1441; name = "Tank Monitor"; sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")},/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/engine/break_room) "bTm" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/atmos) @@ -5380,8 +5380,8 @@ "bZx" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; level = 2},/obj/structure/closet/fireaxecabinet{pixel_y = -32},/obj/machinery/space_heater,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/atmos) "bZy" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; level = 2},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/space_heater,/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/atmos) "bZz" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; level = 2},/obj/structure/sign/securearea,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/atmos) -"bZA" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; level = 2},/obj/structure/table,/obj/item/clothing/head/welding{pixel_x = 1; pixel_x = -5; pixel_y = 3},/obj/item/stack/sheet/glass{amount = 50},/obj/item/clothing/head/welding{pixel_x = 0; pixel_x = -5; pixel_y = 3},/obj/item/clothing/glasses/welding,/turf/simulated/floor,/area/atmos) -"bZB" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/weapon/wrench,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 9; icon_state = "intact-r"; level = 2},/turf/simulated/floor,/area/atmos) +"bZA" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/weapon/wrench,/turf/simulated/floor,/area/atmos) +"bZB" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; level = 2},/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/atmos) "bZC" = (/obj/structure/table,/obj/item/device/t_scanner,/obj/item/device/multitool{pixel_x = 5},/obj/item/device/radio/headset/headset_eng,/obj/item/weapon/cartridge/atmos,/obj/item/weapon/cartridge/atmos,/obj/item/device/pipe_painter,/turf/simulated/floor,/area/atmos) "bZD" = (/obj/machinery/atmospherics/tvalve/mirrored/digital,/turf/simulated/floor,/area/atmos) "bZE" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "Waste to Port"},/turf/simulated/floor,/area/atmos) @@ -5691,7 +5691,7 @@ "cfw" = (/obj/structure/table,/obj/item/weapon/folder/yellow,/turf/simulated/floor,/area/engine/break_room) "cfx" = (/obj/effect/landmark/start{name = "Atmospheric Technician"},/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor,/area/engine/break_room) "cfy" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor,/area/engine/break_room) -"cfz" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r"; level = 2},/obj/machinery/power/apc{dir = 8; name = "Atmospherics APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/atmos) +"cfz" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 9; icon_state = "intact-r"; level = 2},/obj/machinery/computer/atmoscontrol,/turf/simulated/floor,/area/atmos) "cfA" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; level = 2},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/atmos) "cfB" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos) "cfC" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r"; level = 2},/turf/simulated/floor,/area/atmos) @@ -10283,21 +10283,21 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafbGrbGrbGrbGrbGrbPTbGraaaaaaaaaaaabGtbPUbPVbPWbPXbGtbPYbGtbPZbQabQbbQcbQcbQdbQebQfbQgbQhbQibQjbQjbQjbQkbQlbQjbQjbQmbQibQnbQjbQjbQjbQkbQjbGybGybGybGybGybGybGybGybGybGXbsabQobQpapYapZbQsbzTbQtaqkaqzbQwbQxbQybqDbGWbQzbQAbQBbQCbQDbQEbQFbQGbQGbQHbQIbQJbQKboabQLboabPBbLGboabQMaafbPDbQNbQNbQObQPbQQbQRbQSbQTbHfbQUbHkbAvbINbINbINbINbINaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEDbKpbKpbKpbKpbKpbKpbQVbGbbKobKpbQWbGbbGbbGbbGbbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabQXbQYbMfbGrbGrbGrbGrbGrbGtbGtbGtbGtbGtbGtbGtbGtbQZbRabRbbRcbRdbRebRfbRfbRgbRhbRibRjbRkbRlbRmbRnbRobRpbRqbRrbRsbRtbRubRvbRwbRxaafaaaaaaaaaaaaaaaaaabGybRybGXbsabNXbqDbsabqDbNXbRzbsabqDbqDbqDbqDbqDbqDbGWbRAbGYbRBbRBbRCbRDbREbRFbRDbRGbRHbRIbRJbRKboabRLbPBbLGbRMbRNaafbPDbQNbRObPGbRPbPGbRQbRRbRSbHfbQUbHkbRTbRUbyMaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbEDbGbbGbbGbbGbbGbbGbbNlbGbbQWbGbbGbbGbbGbbGbbEDbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafbRVbRWbRXbRYbRYbRZbSabSbbScbSdbSebSfbSgbSfbShbScbSibSjbSkbSlbSmbSnbSobSobSpbSqbRibSrbRkbRlbSsbRnbStbSubSvbSwbSxbSybSxbSzbSAbSBaafbSCbSCbSCbSCbSCaaabGybSDbSEbPbbPcbPdbPbbSFbSGbSHbSIbSFbPdbPdbPdbPdbPdbSJbSKbGYbSLbSMbSNbSObSPbSQbSRbGYbGYbqXbSSbqXbqXbqXbSTbSUbSVbqXbHfbHfbHfbHfbHfbSWbHfbHfbHfbHfbHfbQUbHkbSXbRUbyMaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEDbEDbLYbGbbGbbGbbGbbGbbGbbGbbGbbGbbGbbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabSYaaaaafaafbSZbSZbSZbSZbSZbSZbSZbSZbTabTbbScbTcbSdbSdbSfbTdbShbScbTebTfbSkbTgbThbRfbTibTjbTkbTlbTmbTnbTobTpbSxbRnbTqbSubTrbTsbTtbTubTvbTwbTxbTybTzbTAbTBbTCbTDbSCaaabGybTEbTFbTGbTHbTIbTJbTKbTLbTMbTNbTKbTKbTObTPbTKbTKbTQbGXbGYbGYbGYbGYbGYbGYbTRbGYbGYbTSbTTbTUbTVbTWbqXbSSbTXbTYbqXbTZbUabUbbUcbUdbQUbAvbAvbUebAvbUfbQUbHkbUgbyMbyMbyMaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbECbEDbOybOwbOwbGbbGbbGbbGbbGbbGbbGbbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabSYaaaaafaafbSZbSZbSZbSZbSZbSZbSZbSZbTabTbbScbTcbSdbSdbSfbTdbShbScbTebTfbSkbTgbThbRfbTibRfbTkbTlbTmbTnbTobTpbSxbRnbTqbSubTrbTsbTtbTubTvbTwbTxbTybTzbTAbTBbTCbTDbSCaaabGybTEbTFbTGbTHbTIbTJbTKbTLbTMbTNbTKbTKbTObTPbTKbTKbTQbGXbGYbGYbGYbGYbGYbGYbTRbGYbGYbTSbTTbTUbTVbTWbqXbSSbTXbTYbqXbTZbUabUbbUcbUdbQUbAvbAvbUebAvbUfbQUbHkbUgbyMbyMbyMaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbECbEDbOybOwbOwbGbbGbbGbbGbbGbbGbbGbbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUhbUibUjbUkbUkbUkbUlbUmbUnbUobUpbUqbUrbSZbUsbTbbScbUtbSdbSebSdbSfbUubScbUvbTfbSkbSlbUwbRfbRfbRfbUxbUybUzbUAbUBbSxbUCbUDbSxbUEbTrbTsbUFbUGbUGbUHbUIbUJaafbUKbULbTDbUMbSCaafbGybUNbUObGyaaaaafaaabUPbUQbURbUSbUPaafaafaaaaafbGybUTbUUbPdbPdbPdbPdbPdbPdbPbbPdbPdbPdbPdbPcbUVbPdbUWbUXbUYbUZbVabVbbVcbVcbVcbVdbVebVcbVcbVcbVcbVfbVgbVhbVibVjbVkbyMbyMbyMbyMaaaaafaaaaaaaaaankankankaafaaaaaaaafaaaaaaaafaaaaaabIObEDbHmbEDbEDbGbbGbbGbbGbbGbbGbbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVlbVlbVlbVlbVlbVmbVnbVobVpbVpbVqbSZbVrbVsbVtbVubVvbVwbSdbSdbVxbScbVybVzbVAbVBbVBbVCbVDbVEbVFbVGbVHbVIbVJbSxbRnbSxbVKbVLbVMbVNbVObVPbVQbVRbVSbVTbVUbTAbVVbTDbTDbSCaafbGybTVbTVbGyaaaaafaaabVWbVXbVYbVZbVWaafaafaaaaafbGybWabWbbWcbWdbKZbWebWebWfbWgbWhbWibTKbTKbTObTPbTKbTKbWjbWkbWlbWmbWmbWnbWobWobWpbWmbWmbWnbWobWobWpbWmbWqbAvbWrbWsbWtbWubWvbWwbWxbWybWybWybWybWybWybWybWybWybWybWybWybWybWybWybWybWzbWAbWAbWBbEDbEDbGbbGbbWCbGbbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaafaafbWDbWEbWFbWGbWFbWHbWIbWJbWKbWKbWLbSZbWMbIWbScbWNbSdbWObSdbSdbSdbWPbUvbTfbSkbWQbQcbWRbWSbWTbWUbWVbRibWWbWXbSxbRnbSxbWYbWSaqMbXabXbbXcbXdbXebXdbXfaafbSCbSCbSCbSCbSCaafbGybGybXgbGyaafaafaafbXhbXibXjbXkbXhaafaaaaaaaafbGybGybGybGybGybXlbGybGybXmbXnbXobGybGyaaaaaaaaaaaabXpbXqbXrbXsbXpaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaabyMbXtbXubXvbyMbyMbyMbyMaaaaafaaaaaaaaaankankankaafaaaaaaaafaaaaaaaafaafaafbXwbXxbXybHnbECbEDbEDbGbbGcbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbWDbXzbXAbXBbXCbVobXDbVobXEbVobXFbXGbXHbXIbScbXJbSdbWObSdbSdbXKbScbXLbXMbSkbXNbQcbRfbXObXPbTobXQbRibXRbVKbXSbXTbXUbXVbXWbXXbXYbXZbYabTtbYbbYcbYdbTzbTAbYebYfbYfbSCaafaafbTVbYgbTVaaaaafaaabYhbYibYjbYkbYhaafaaaaaaaafaaaaaaaaabGybYlbTVbYmbGyaaaaafaaaaaaaafaaaaaaaaaaaabYnbYobYpbYqbYnaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaabYrbYrbYsbYtbYraaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbYubEAbEAbEBbECbECbEDbEDbEDbEDbEEaafaafaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafbWDbYvbYwbYxbYwbYybYzbYAbYBbYCbYDbSZbMfbIWbScbYEbSdbYFbYGbYHbYIbScbYJbTfbSkbYKbYLbYMbYNbSAbYObYPbYQbSAbYRbYSbYTbSAbYUbYVbYWbYXbYYbSxbYZbZabZbbUJaafbUKbZcbZdbZebSCaafaaaaaaaaaaaaaaaaaaaaabZfbUPbZgbZhbZfaafaafaafaafaafaafaaabGybZibZjbZkbGyaaaaafaaaaaaaafaaaaaaaaaaaabZlbZmbZnbZobZlaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaabYrbZpbZqbZrbYraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafbVlbVlbVlbVlbVlbSZbSZbSZbSZbSZbSZbSZbMfbIWbScbScbScbScbScbScbScbScbYJbTfbSkbZsbZtbZubZvbZwbZxbZybZzbZAbZBbZCbRnbSxbZDbZEbZFbZGbZHbSxbYZbZIbZJbZKbVUbTAbZLbYfbYfbSCaafaaaaaaaaaaafaafaafaaabUPbZMbZNbZObUPbUPbUPbUPbUPbUPbUPaafbGybGybGybGybGyaaaaafaaaaaaaafaaaaaaaaaaaabZPbZQbZRbZSbZPaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaabYrbZTbZUbZVbYraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafbVlbVlbVlbVlbVlbSZbSZbSZbSZbSZbSZbSZbMfbIWbScbScbScbScbScbScbScbScbYJbTfbSkbZsbZtbZubZvbZwbZxbZybZzbZBcfzbZCbRnbSxbZDbZEbZFbZGbZHbSxbYZbZIbZJbZKbVUbTAbZLbYfbYfbSCaafaaaaaaaaaaafaafaafaaabUPbZMbZNbZObUPbUPbUPbUPbUPbUPbUPaafbGybGybGybGybGyaaaaafaaaaaaaafaaaaaaaaaaaabZPbZQbZRbZSbZPaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaabYrbZTbZUbZVbYraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbIWbGrbGrbGrbGrbZWbIWbIWbZXbZYbZYbZYbZYbZZcaacaacabcaccaccaccaccaccaccacbSbbGrcadbTfbSkcaecafcagbQkbQjcahcaicajcaicakcalbRnbSxbTrcamcancaocapbSxbYZbZacaqbUJaafbSCbSCbSCbSCbSCaafaaabUPbUPbUPbUPbUPbUPbUPcarcascatcaucavcawcaxcaycavbUPaafaafaafaafaafaafaafcazaafaafaafaafaafaafaafcaAbXpcaBcaCcaAaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaabYrcaDcaEcaFbYraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafcaGcaHcaIcaJcaKcaLbIWbIWbTacaMbIWbGrbGrcaNcaObGrbGrcaPcaQcaObGrbGrcaRbIWbTbbGrbYJbTfbSkcaScaTbRfcaUbQccaVcaWcaXcaYbQicaZbRnbSxbWYcbabZFbWXcbbcbccbdcbecbfbYdbTzbTAcbgcbhcbibSCaafaaabUPcbjcbkcblcbmbUPcbncbocascbpcaubXicbqcbrcbsbXibUPaaaaaaaaaaafaaaaaaaaaaafaaaaaaaafaaaaaaaaaaaabXpcbtcbucbvbXpaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaacbwcbxcbycbzcbAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaabIWbGrbGrbGrbGrcbBcbCcbCcbDcbEcbFcbEaaacbGaaaaaaaaaaaaaaaaaaaaabGrcbHbIWbTbbGrcbIcbJcbKcbLcbMcbNcbOcbPcbQcbRcbSbRfcbTcbUcbVbSxbWYcbacbWbWXcbbcbXbYZbZacbYbUJaafbUKcbZccaccbbSCaafaaabUPcccccdccecaubUPccfcauccgccfcaucchcciccjcckcclbUPaaaaaaaaaaafaaaaaaaaabXpbXpbXpbXpbXpbXpbXpbXpbXpccmccnccobXpaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafccpccqccpaafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafbGrccrcbEcbEccscbEcctcbEcbEccuccvcbEcbEccwccxccvcbEcbEcbEcbEccycczccAccBbSkccCccDbRfbRgbRfbRfbRfbRfbRfccEccFccGbSxbWYcbabZFbWXccHccIccJccKccLbZKbVUbTAccMcbhcbhbSCaafccNccOccPccQccRccSccRccTccUccVccWccXccYccZccRcdacdbbUPaaaaaaaaaaafaaaaaaaaabXpcdccddcdecdfcdgcdhcdicdjcdkcdlcdmcdncdoaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaafcdpcdqcdpaafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOalOalOalNalNalOalNalNalNamnalNalNalNalOalOaaaaaaaafaafaaaaaaaaaaaaaaaaaaaafbIZccrcdrcdscdtcducdvcdwcdxcdycdzcdAcbEcdzcdBcdCcdDcdDcdEcbEcdFcdGcdHcdIbSkccCcdJcdKbRgbRfbTibRfcdLcdMcdNcdOcdPbSxbWYbSxcdQbSxcdRcdSbYZbZacdTbUJaafbSCbSCbSCbSCbSCaafaaabUPcdUbVXcdVcdWcdXbVZcdYcdZceacdVcebceccdVbVZcedbUPaafaafaafaafaafaafaafbXpceecefceecegcehbZmceicdjcejcekcejbXpbXpaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaafaaacelaaaaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOaaaaaaaafaafaaaaafaafaaaaaaaafaafaafaaaalOaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaabKEccrcemcenceocepceqceqceqceqcercescetcdDceucdDcdDcevcdDcewcexceycezcdIbSkccCceAceBbRgceCceDceEbRgceDceFceGceHbSxbWYbSxbTrcamceIceJceKceLceMbYdbTzbTAceNceOceObSCaafaaabZfcchcePceQbUPceRceScecceTceUceVceWcckceXceYceZbUPaaaaaaaaaaafaaaaaaaaabXpceeceeceecfacfbcdhcfccfdcfecffcfgcfhbXpaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafaaacfiaaaaafaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOaaacfjcfkcflaaacfjcfkcflaaacfjcfkcflaafcfmaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaabKEccrcemcfncdDcevcfocdDcdDcdDcdDcdDcfncfncdDcdDcdDcdDcfpcfqcexcfrcexcfscftceAceAcfubRgcfvcfwcfxbRgcfybQicfzcfAcfBcfCbXUbVMcfDcfEbTtbVObZacfFbUJaafbUKcfGcfHcfIbSCaafaafaafaafaafaafbUPcfJbXibXkcfKcfLbXhcdYcfMbXhcfMcdYbUPaaaaaaaaaaafaaaaaaaaabXpcdjcdjcdjcdjcfNbZmcfOcfPcfQcfRcfScfTbXpaaaaaaaaaaaaaaacfUcfUcfUcfVaafaafaafaafcfiaafaafaafaafaafamncfUcfUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOaaacfjcfWcflaaacfjcfWcflaaacfjcfWcflaafaafaafaafaaaaaaaaaaaaaaaaaaaafaafaafbKEccrcfXcfncfYcdDcfZcgacgbcgbceucdDcfncgccdDcdDcdDcdDcgdcgecgfcggbKPcghcgicgjcgkcglbRgcfvceDcgmbRgcgnbQibWYbSxbSxcfDbSAcgobYOcgpcgqbRvcgrcgsbZKbVUbTAcgtceOceObSCaafaaaaaaaafaaaaaabUPcgubXibXkbXicgvbXhbXibXkbXhbXkcgwbUPaaaaaaaaaaafaaaaaaaaabXpcdccddcdecgxcgycdhcgzcgAcgBcgCbZmcgDbXpaaaaaaaaaaaaaaacfUaaaaafaaaaafaaaaaaaaacgEaaaaafaafaaaaaaaaaaaacfUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOaaacfjcfkcflaaacfjcfkcflaaacfjcfkcflaafcfmaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaabKEccrcemcfncdDcevcfocdDcdDcdDcdDcdDcfncfncdDcdDcdDcdDcfpcfqcexcfrcexcfscftceAceAcfubRgcfvcfwcfxbRgcfybQibTjcfAcfBcfCbXUbVMcfDcfEbTtbVObZacfFbUJaafbUKcfGcfHcfIbSCaafaafaafaafaafaafbUPcfJbXibXkcfKcfLbXhcdYcfMbXhcfMcdYbUPaaaaaaaaaaafaaaaaaaaabXpcdjcdjcdjcdjcfNbZmcfOcfPcfQcfRcfScfTbXpaaaaaaaaaaaaaaacfUcfUcfUcfVaafaafaafaafcfiaafaafaafaafaafamncfUcfUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOaaacfjcfWcflaaacfjcfWcflaaacfjcfWcflaafaafaafaafaaaaaaaaaaaaaaaaaaaafaafaafbKEccrcfXcfncfYcdDcfZcgacgbcgbceucdDcfncgccdDcdDcdDcdDcgdcgecgfcggbKPcghcgicgjcgkcglbRgcfvceDcgmbRgcgnbQibZAbSxbSxcfDbSAcgobYOcgpcgqbRvcgrcgsbZKbVUbTAcgtceOceObSCaafaaaaaaaafaaaaaabUPcgubXibXkbXicgvbXhbXibXkbXhbXkcgwbUPaaaaaaaaaaafaaaaaaaaabXpcdccddcdecgxcgycdhcgzcgAcgBcgCbZmcgDbXpaaaaaaaaaaaaaaacfUaaaaafaaaaafaaaaaaaaacgEaaaaafaafaaaaaaaaaaaacfUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaalNaafcfjcfWcflaaacfjcfWcflaafcfjcfWcflaafaaaaaaaafaafaaaaaaaaaaaaaaaaafaaaaaabOCccrcbEcgFcdDcgGcgHcgIcgJcgKcgJcgLcgJcgMcgNcdzcgOcfncfncfqbMqcgPcgQcgRcgScgTcgUcgVcgWcgXcgYbLschachbbQichcbSxbSxchdbSxbSxbSxbSzbYVchdbZacaqbUJaafbSCbSCbSCbSCbSCaafaaaaaaaafaaaaaabUPchechfchgchhchichjchkchlchjchlchkbUPaafaafaafaafaafaafaafbXpceeceeceechmcehbZmchnchochpchqbZmchrbXpbXpbXpbXpaaaaaacfUaaachschschschschsaafchtaafchschschschschsaaacfUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaacfjcfWcflaafcfjcfWcflaaacfjcfWcflaaaaaaaaaaaaaaaaafaaaaafaaaaafaafaaaaaabGrccrcbEchuchvchvchwcbEcbEcbEcbEcbEcbEcbEcbEcbEcbEcbEcbEcbEbGrchxbGrchybGrbQcchzchAchBchCchDchEchFchGbQichHchIchJchKchLchMchLchKchNchKchOcfDchPaafaafaafaafaafaafaafaaaaaaaaaaaaaaabUPbUPchQchRchSbUPbUPchTbUPbUPbUPchTbZfaaaaaaaaaaaaaaaaaaaaabXpceeceeceecgxchUcdhchVchWchXchYchZchZciacibcicbXpaafaafcfUaafcidcieciecieciecifchtcigcihcihcihcihciiaafcfUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalOalOalNaafaaacfjcfWcflaafcfjcfWcflaaacfjcfWcflaafaaaaaaaaaaaaaafaafcijcikcikcikcikbGrbGrccrcbEcilcimcimcinciocipciqciqciqciqciqciqcirciqciqciscisciqcitciucivciwbQccixciycizciAciBciCbRfciDcahbTnciEciFciGciHciIciJciKbSxciLciMciNbSuaafaafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafbUPcchcePciObUPaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaabXpcdjcdjcdjcdjciPbZmchnciQciRchqbZmbZmciSbZmciTbXpaaaaaacfUaafciUciUciUciUciUaaachtaaaciUciUciUciUciUaafcfUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From d2d08208a87ff38ff3ae3f04215f5115a7cd09e6 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Thu, 29 Aug 2013 22:06:27 +0100 Subject: [PATCH 09/18] made zburn/firelevel more predictable. Probably won't change much ingame, but it's a start. Signed-off-by: Mloc-Argent --- code/ZAS/Fire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 0a9240faee3..cd767b850b1 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -262,7 +262,7 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue //slows down the burning when the concentration of the reactants is low var/dampening_multiplier = total_combustables / (total_combustables + nitrogen + carbon_dioxide) //calculates how close the mixture of the reactants is to the optimum - var/mix_multiplier = 1 / (1 + (5 * ((oxygen / total_combustables) ^2))) + var/mix_multiplier = 1 / (1 + (5 * ((oxygen / total_combustables) ** 2))) //toss everything together firelevel = vsc.fire_firelevel_multiplier * mix_multiplier * dampening_multiplier From a7f1b50f1be179435a4d00de3277393bd5ea09a7 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Fri, 30 Aug 2013 00:38:10 +0100 Subject: [PATCH 10/18] Fixes reagent and throw logging. --- code/game/atoms.dm | 3 --- code/modules/mob/living/living_defense.dm | 6 +++--- code/modules/reagents/reagent_containers/dropper.dm | 12 ++++++++---- code/modules/reagents/reagent_containers/glass.dm | 11 +++++++---- .../modules/reagents/reagent_containers/hypospray.dm | 11 +++++------ .../reagents/reagent_containers/robodropper.dm | 11 +++++++---- code/modules/reagents/reagent_containers/syringes.dm | 11 +++++++---- 7 files changed, 37 insertions(+), 28 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b8e9f1799f3..44440e82885 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -26,9 +26,6 @@ var/mob/living/M = hit_atom M.hitby(src,speed) - M.attack_log += text("\[[time_stamp()]\] Has been hit with [src], last touched by [src.fingerprintslast]") - msg_admin_attack("[hit_atom] ([M.ckey]) was hit by [src] last touched by ([src.fingerprintslast]) (JMP)") - else if(isobj(hit_atom)) var/obj/O = hit_atom if(!O.anchored) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index dbe8cc268ef..1ebb3ca358b 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -81,9 +81,9 @@ if(assailant && assailant.mob && istype(assailant.mob,/mob)) var/mob/M = assailant.mob - src.attack_log += text("\[[time_stamp()]\] Has been hit with [O], last touched by [M.name] ([assailant.ckey])") - M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with [O]") - msg_admin_attack("[src.name] ([src.ckey]) was hit by [O], last touched by [M.name] ([assailant.ckey]) (JMP)") + src.attack_log += text("\[[time_stamp()]\] Has been hit with a thrown [O], last touched by [M.name] ([assailant.ckey])") + M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") + msg_admin_attack("[src.name] ([src.ckey]) was hit by a thrown [O], last touched by [M.name] ([assailant.ckey]) (JMP)") // Begin BS12 momentum-transfer code. diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 7455e8118be..09da254712c 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -65,10 +65,14 @@ src.reagents.reaction(target, TOUCH) var/mob/living/M = target - var/contained = english_list(src.reagents) - M.attack_log += text("\[[time_stamp()]\] Has been squirted ([contained]) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to squirt [M.name] ([M.key]) with [contained]") - msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + + var/list/injected = list() + for(var/datum/reagent/R in src.reagents.reagent_list) + injected += R.name + var/contained = english_list(injected) + M.attack_log += text("\[[time_stamp()]\] Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]") + msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You transfer [trans] units of the solution." diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 79c64304d51..000a671e0d3 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -75,10 +75,13 @@ user << "\blue You splash the solution onto [target]." var/mob/living/M = target - var/contained = english_list(src.reagents) - M.attack_log += text("\[[time_stamp()]\] Has been splashed ([contained]) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to splash [M.name] ([M.key]) with [contained]") - msg_admin_attack("[user.name] ([user.ckey]) splashed [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + var/list/injected = list() + for(var/datum/reagent/R in src.reagents.reagent_list) + injected += R.name + var/contained = english_list(injected) + M.attack_log += text("\[[time_stamp()]\] Has been splashed with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to splash [M.name] ([M.key]). Reagents: [contained]") + msg_admin_attack("[user.name] ([user.ckey]) splashed [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] has been splashed with something by []!", target, user), 1) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index bdecdece517..c7875b7fe62 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -39,14 +39,13 @@ var/list/injected = list() for(var/datum/reagent/R in src.reagents.reagent_list) injected += R.name + var/contained = english_list(injected) + M.attack_log += text("\[[time_stamp()]\] Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]") + msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") var/trans = reagents.trans_to(M, amount_per_transfer_from_this) - user << "\blue [trans] units injected. [reagents.total_volume] units remaining in [src]." - - var/contained = english_list(injected) - M.attack_log += text("\[[time_stamp()]\] Has been injected ([contained]) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.key]) with [contained]") - msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + user << "\blue [trans] units injected. [reagents.total_volume] units remaining in [src]." return diff --git a/code/modules/reagents/reagent_containers/robodropper.dm b/code/modules/reagents/reagent_containers/robodropper.dm index 4b199d2011c..475a29c331e 100644 --- a/code/modules/reagents/reagent_containers/robodropper.dm +++ b/code/modules/reagents/reagent_containers/robodropper.dm @@ -63,10 +63,13 @@ src.reagents.reaction(target, TOUCH) var/mob/M = target - var/contained = english_list(src.reagents) - M.attack_log += text("\[[time_stamp()]\] Has been squirted ([contained]) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to squirt [M.name] ([M.key]) with [contained]") - msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + var/list/injected = list() + for(var/datum/reagent/R in src.reagents.reagent_list) + injected += R.name + var/contained = english_list(injected) + M.attack_log += text("\[[time_stamp()]\] Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]") + msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") trans = src.reagents.trans_to(target, amount_per_transfer_from_this) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index e36037ef254..ebb4cb58440 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -148,10 +148,13 @@ if(istype(target,/mob/living)) var/mob/living/M = target - var/contained = english_list(src.reagents) - M.attack_log += text("\[[time_stamp()]\] Has been injected ([contained]) with [src.name] by [user.name] ([user.ckey])") - user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.key]) with [contained]") - msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + var/list/injected = list() + for(var/datum/reagent/R in src.reagents.reagent_list) + injected += R.name + var/contained = english_list(injected) + M.attack_log += text("\[[time_stamp()]\] Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]") + msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") src.reagents.reaction(target, INGEST) if(ismob(target) && target == user) From 7dae19a3f91d2521e7ae1f997fb16342c6203b5f Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 30 Aug 2013 04:40:39 +0300 Subject: [PATCH 11/18] Fix for #3498. --- code/game/machinery/computer/camera.dm | 2 +- .../structures/stool_bed_chair_nest/chairs.dm | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 857d4169ea1..5352d3d833a 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -162,7 +162,7 @@ T = get_step(T,direct) console.jump_on_click(src,T) return - ..(n,direct) + return ..(n,direct) /obj/machinery/computer/security/telescreen name = "Telescreen" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 762888a4b43..adc1e637a78 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -35,17 +35,8 @@ src.layer = FLY_LAYER else src.layer = OBJ_LAYER - if(buckled_mob) - if(buckled_mob.loc != src.loc) - buckled_mob.buckled = null //Temporary, so Move() succeeds. - if(!buckled_mob.Move(loc)) - unbuckle() - buckled_mob = null - else - buckled_mob.buckled = src //Restoring - if(buckled_mob) - buckled_mob.dir = dir + buckled_mob.dir = dir /obj/structure/stool/bed/chair/verb/rotate() set name = "Rotate Chair" @@ -114,6 +105,12 @@ /obj/structure/stool/bed/chair/office/Move() ..() + if(buckled_mob) + buckled_mob.buckled = null //Temporary, so Move() succeeds. + var/moved = buckled_mob.Move(src.loc) + buckled_mob.buckled = src + if(!moved) + unbuckle() handle_rotation() /obj/structure/stool/bed/chair/office/light From 51ea24b0fee0352e47b994206fd2846e8221d2a2 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Sun, 1 Sep 2013 21:17:09 +0100 Subject: [PATCH 12/18] Genericify this shit. Signed-off-by: Mloc-Argent --- config/example/config.txt | 2 +- config/example/motd.txt | 8 ++------ config/example/rules.html | 5 ++++- html/changelog.html | 9 ++------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/config/example/config.txt b/config/example/config.txt index a0e32f3179e..74f6cc821f2 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -1,5 +1,5 @@ ## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice -# SERVERNAME tgstation +# SERVERNAME spacestation13 ## Alert levels ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced. diff --git a/config/example/motd.txt b/config/example/motd.txt index 3ba8d1d8a50..f47164c6df1 100644 --- a/config/example/motd.txt +++ b/config/example/motd.txt @@ -1,9 +1,5 @@ -

Welcome to Baystation 12!

+

Welcome to Space Station 13!

--This server is running Baystation 12's modification of the /tg/station13 SS13 code. +-This server is running Baystation 12's modification of the /tg/station13 SS13 code.

Bugtracker: http://baystation12.net/forums/viewtopic.php?f=18&t=8185 -
-Rules and roleplaying tips: http://baystation12.net/wiki/index.php/Rules or the Rules command. -

-This is a roleplaying server, so don't forget to remain in character while playing. Make sure to read and abide by the rules and if you have any questions, feel free to adminhelp! Remember that even when there are no admins on, adminhelps are being sent to IRC and it is possible for an administrator to see it and respond. \ No newline at end of file diff --git a/config/example/rules.html b/config/example/rules.html index 3992b2a18e4..af38d30f911 100644 --- a/config/example/rules.html +++ b/config/example/rules.html @@ -2,7 +2,10 @@ Server Rules + + \ No newline at end of file diff --git a/html/changelog.html b/html/changelog.html index 844c8ce2bc3..f03cdfefe23 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -25,13 +25,9 @@ Header Section
-
Baystation 12 - A Space Station 13 Server
-

-
Visit our IRC channel: #bs12 on irc.sorcery.net
+
Space Station 13
+

Code licensed under GPLv3. Content licensed under CC BY-SA 3.0.

- -By playing to agreed to read and abide by the rules!
-
@@ -46,7 +42,6 @@ Header Section - [C.B] [(C.indirect?"Open":"Closed")]" - current_zone_images += image('debug_connect.dmi', C.A, null, TURF_LAYER) - current_zone_images += image('debug_connect.dmi', C.B, null, TURF_LAYER) + current_zone_images += image('icons/misc/debug_connect.dmi', C.A, null, TURF_LAYER) + current_zone_images += image('icons/misc/debug_connect.dmi', C.B, null, TURF_LAYER) client << "Connected Zones:" for(var/zone/zone in connected_zones) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index cd767b850b1..d057bad4c3d 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -51,7 +51,7 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) //luminosity = 3 - icon = 'fire.dmi' + icon = 'icons/effects/fire.dmi' icon_state = "1" layer = TURF_LAYER diff --git a/code/ZAS/ZAS_Turfs.dm b/code/ZAS/ZAS_Turfs.dm index 0070a19c5d2..04af9a05283 100644 --- a/code/ZAS/ZAS_Turfs.dm +++ b/code/ZAS/ZAS_Turfs.dm @@ -50,7 +50,7 @@ var/siding_icon_state = return_siding_icon_state() if(siding_icon_state) - overlays += image('floors.dmi',siding_icon_state) + overlays += image('icons/turf/floors.dmi',siding_icon_state) var/datum/gas_mixture/model = return_air() switch(model.graphic) if(1) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index fcdda875a79..2404b335096 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -366,4 +366,4 @@ var/list/DummyCache = list() if(delay) spawn(delay) for(var/client/C in group) - C.screen -= O + C.screen -= O diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 60701479e1a..d0db2d66b90 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -68,7 +68,7 @@ comm.messagetitle.Add("Cent. Com. CONFIDENTIAL REPORT") comm.messagetext.Add(intercepttext) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') // add an extra law to the AI to make sure it cooperates with the heads var/extra_law = "Crew authorized to know of pathogen [virus_name]'s existence are: Heads of command, any crew member with loyalty implant. Do not allow unauthorized personnel to gain knowledge of [virus_name]. Aid authorized personnel in quarantining and neutrlizing the outbreak. This law overrides all other laws." @@ -89,7 +89,7 @@ comm.messagetitle.Add("Cent. Com. CONFIDENTIAL REPORT") comm.messagetext.Add(intercepttext) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') /datum/game_mode/epidemic/post_setup() @@ -194,7 +194,7 @@ ticker.mode:explosion_in_progress = 1 for(var/mob/M in world) if(M.client) - M << 'Alarm.ogg' + M << 'sound/machines/Alarm.ogg' world << "\blueIncoming missile detected.. Impact in 10.." for (var/i=9 to 1 step -1) sleep(10) diff --git a/code/game/gamemodes/events/PortalStorm.dm b/code/game/gamemodes/events/PortalStorm.dm index b071197c3a4..890755d6b8e 100644 --- a/code/game/gamemodes/events/PortalStorm.dm +++ b/code/game/gamemodes/events/PortalStorm.dm @@ -18,7 +18,7 @@ var/obj/portal/P = new /obj/portal( T ) P.target = picked P.creator = null - P.icon = 'objects.dmi' + P.icon = 'icons/obj/objects.dmi' P.failchance = 0 P.icon_state = "anom" P.name = "wormhole" diff --git a/code/game/gamemodes/events/VirusEpidemic.dm b/code/game/gamemodes/events/VirusEpidemic.dm index f44b631a207..54b9760a2f7 100644 --- a/code/game/gamemodes/events/VirusEpidemic.dm +++ b/code/game/gamemodes/events/VirusEpidemic.dm @@ -74,7 +74,7 @@ break spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('outbreak7.ogg') + world << sound('sound/AI/outbreak7.ogg') Tick() ActiveFor = Lifetime //killme diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index a78e8dd8ae0..d37dc31f8d5 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -253,7 +253,7 @@ Implants; comm.messagetitle.Add("Cent. Com. Status Summary") comm.messagetext.Add(intercepttext) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') /* command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") for(var/mob/M in player_list) diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 98923b49eef..6a3f6edf6fa 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -238,7 +238,7 @@ comm.messagetitle.Add("Cent. Com. Announcement") comm.messagetext.Add(message) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') /datum/game_mode/revolution/rp_revolution/latespawn(mob/M) if(M.mind.assigned_role in command_positions) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index f2ad62d05e4..28f9bfe4126 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -5,7 +5,7 @@ var/mob/living/carbon/occupant var/locked name = "Body Scanner" - icon = 'Cryogenic2.dmi' + icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scanner_0" density = 1 anchored = 1 @@ -167,7 +167,7 @@ var/delete var/temphtml name = "Body Scanner Console" - icon = 'Cryogenic2.dmi' + icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scannerconsole" density = 1 anchored = 1 diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index ea2456cf977..37c9b674cf3 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -63,7 +63,7 @@ /obj/machinery/alarm name = "alarm" - icon = 'monitors.dmi' + icon = 'icons/obj/monitors.dmi' icon_state = "alarm0" anchored = 1 use_power = 1 diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index d29b1f065c0..be382551462 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -130,4 +130,4 @@ src.target = loc /obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - return + return diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index dbfd5b62e6a..d8e45dab061 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -143,4 +143,4 @@ user << "\blue Tank is empty!" return - return + return diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm index 5881f08ce28..fe110939a09 100644 --- a/code/game/machinery/bots/farmbot.dm +++ b/code/game/machinery/bots/farmbot.dm @@ -26,7 +26,7 @@ /obj/machinery/bot/farmbot name = "Farmbot" desc = "The botanist's best friend." - icon = 'aibots.dmi' + icon = 'icons/obj/aibots.dmi' icon_state = "farmbot0" layer = 5.0 density = 1 @@ -515,7 +515,7 @@ /obj/item/weapon/farmbot_arm_assembly name = "water tank/robot arm assembly" desc = "A water tank with a robot arm permanently grafted to it." - icon = 'aibots.dmi' + icon = 'icons/obj/aibots.dmi' icon_state = "water_arm" var/build_step = 0 var/created_name = "Farmbot" //To preserve the name if it's a unique farmbot I guess diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index e29097a0308..9c493e715dc 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -400,7 +400,7 @@ else var/mob/selected = find_dead_player("[C.fields["ckey"]]") - selected << 'chime.ogg' //probably not the best sound but I think it's reasonable + selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") if(answer != "No" && pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"])) temp = "Initiating cloning cycle..." diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 909364a4809..bc050c6d1d6 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -13,7 +13,7 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle name = "Spec. Ops. Shuttle Console" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "shuttle" req_access = list(access_cent_specops) // req_access = list(ACCESS_CENT_SPECOPS) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e05d9511e4e..4a0777903f7 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -3,7 +3,7 @@ /obj/machinery/door/firedoor name = "\improper Emergency Shutter" desc = "Emergency air-tight shutter, capable of sealing off breached areas." - icon = 'DoorHazard.dmi' + icon = 'icons/obj/doors/DoorHazard.dmi' icon_state = "door_open" req_one_access = list(access_atmospherics, access_engine_equip) opacity = 0 @@ -275,5 +275,5 @@ */ /obj/machinery/door/firedoor/multi_tile - icon = 'DoorHazard2x1.dmi' + icon = 'icons/obj/doors/DoorHazard2x1.dmi' width = 2 \ No newline at end of file diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 57f1bc4be6e..b7203be245d 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -2,7 +2,7 @@ /obj/machinery/floodlight name = "Emergency Floodlight" - icon = 'floodlight.dmi' + icon = 'icons/obj/machines/floodlight.dmi' icon_state = "flood00" density = 1 var/on = 0 diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index de9d7d832db..073973cdee7 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -2,7 +2,7 @@ /obj/machinery/holosign name = "holosign" desc = "Small wall-mounted holographic projector" - icon = 'holosign.dmi' + icon = 'icons/obj/holosign.dmi' icon_state = "sign_off" layer = 4 var/lit = 0 diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index e5ec4bdb762..370e2f3843e 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -2,7 +2,7 @@ obj/machinery/scanner name = "Identity Analyser" var/outputdir = 0 - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "scanner_idle" density = 1 anchored = 1 diff --git a/code/game/machinery/walllockers.dm b/code/game/machinery/walllockers.dm index 3ffd862fb74..e81219926f7 100644 --- a/code/game/machinery/walllockers.dm +++ b/code/game/machinery/walllockers.dm @@ -1,6 +1,6 @@ /obj/structure/walllocker name = "Wall Locker" - icon = 'lockwall.dmi' + icon = 'icons/obj/lockwall.dmi' icon_state = "emerg" var/list/spawnitems = list() anchored = 1 diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index a7936f15643..fd34b65baa0 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1064,7 +1064,7 @@ /obj/item/weapon/paintkit //Please don't use this for anything, it's a base type for custom mech paintjobs. name = "mecha customisation kit" desc = "A generic kit containing all the needed tools and parts to turn a mech into another mech." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "royce_kit" var/new_name = "mech" //What is the variant called? diff --git a/code/game/objects/closets/walllocker.dm b/code/game/objects/closets/walllocker.dm index 328eae28bf5..4cf3bcf979d 100644 --- a/code/game/objects/closets/walllocker.dm +++ b/code/game/objects/closets/walllocker.dm @@ -4,7 +4,7 @@ /obj/structure/closet/walllocker desc = "A wall mounted storage locker." name = "Wall Locker" - icon = 'walllocker.dmi' + icon = 'icons/obj/walllocker.dmi' icon_state = "wall-locker" density = 0 anchored = 1 diff --git a/code/game/objects/effects/barsign.dm b/code/game/objects/effects/barsign.dm index c5cc2893567..fd66f8028d1 100644 --- a/code/game/objects/effects/barsign.dm +++ b/code/game/objects/effects/barsign.dm @@ -1,5 +1,5 @@ /obj/effect/sign/double/barsign - icon = 'barsigns.dmi' + icon = 'icons/obj/barsigns.dmi' icon_state = "empty" anchored = 1 diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 911a63c0e4c..4f472f864ff 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -87,7 +87,7 @@ name = "drips of blood" desc = "It's red." gender = PLURAL - icon = 'drip.dmi' + icon = 'icons/effects/drip.dmi' icon_state = "1" amount = 0 @@ -141,7 +141,7 @@ density = 0 anchored = 1 layer = 2 - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "mucus" random_icon_states = list("mucus") var/list/datum/disease2/disease/virus2 = list() diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index cc4d766f25a..da4f51eef0a 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -28,7 +28,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa for(var/mob/M in world) if(M.z == epicenter.z) if(!(M in close)) // check if the mob can hear if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space)) - M << 'explosionfar.ogg' + M << 'sound/effects/explosionfar.ogg' if(adminlog) message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ") diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 4721bcc8fe6..6c891df47ab 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -113,7 +113,7 @@ name = "\improper S'rendarr's Hand leaf" singular_name = "S'rendarr's Hand leaf" desc = "A soft leaf that is rubbed on bruises." - icon = 'harvest.dmi' + icon = 'icons/obj/harvest.dmi' icon_state = "cabbage" heal_brute = 7 @@ -121,7 +121,7 @@ name = "\improper Messa's Tear leaf" singular_name = "Messa's Tear leaf" desc = "A cold leaf that is rubbed on burns." - icon = 'harvest.dmi' + icon = 'icons/obj/harvest.dmi' icon_state = "ambrosiavulgaris" heal_burn = 7 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 42def9a2b70..120a6ffa702 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -253,4 +253,4 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ throw_speed = 3 throw_range = 3 origin_tech = "materials=4" - perunit = 2000 + perunit = 2000 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 15530ff720f..9b955195dbe 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -54,4 +54,4 @@ icon_state = "liquidfood" /obj/item/trash/attack(mob/M as mob, mob/living/user as mob) - return + return diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index a6c3b2fede4..1f6b068cdd3 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -2,7 +2,7 @@ #define MALFUNCTION_PERMANENT 2 /obj/item/weapon/implant name = "implant" - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "implant" var/implanted = null var/mob/imp_in = null diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 5d8b135fe1e..dde9668b8cd 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -121,7 +121,7 @@ /obj/item/weapon/implantcase/death_alarm name = "Glass Case- 'Death Alarm'" desc = "A case containing a death alarm implant." - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "implantcase-b" New() diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 3c2cf7fad48..33c511bacb5 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -5,7 +5,7 @@ var/global/list/cached_icons = list() /obj/item/weapon/reagent_containers/glass/paint desc = "It's a paint bucket." name = "paint bucket" - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "paint_neutral" item_state = "paintcan" m_amt = 200 diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 1fb480596bd..0f0ea000ca2 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -111,4 +111,4 @@ maxcharge = 10000 maxcharge = 10000 m_amt = 0 - g_amt = 0 + g_amt = 0 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index fc5c5fb0c0c..7af5304887b 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -794,7 +794,7 @@ LOOK FOR SURGERY.DM*/ //misc, formerly from code/defines/weapons.dm /obj/item/weapon/bonegel name = "bone gel" - icon = 'surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "bone-gel" force = 0 w_class = 2.0 @@ -802,7 +802,7 @@ LOOK FOR SURGERY.DM*/ /obj/item/weapon/FixOVein name = "FixOVein" - icon = 'surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "fixovein" force = 0 throwforce = 1.0 @@ -812,7 +812,7 @@ LOOK FOR SURGERY.DM*/ /obj/item/weapon/bonesetter name = "bone setter" - icon = 'surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "bone setter" force = 8.0 throwforce = 9.0 diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 2a936622766..4593bf932f4 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -1,5 +1,5 @@ /obj/item/weapon/syndie - icon = 'syndieweapons.dmi' + icon = 'icons/obj/syndieweapons.dmi' /*C-4 explosive charge and etc, replaces the old syndie transfer valve bomb.*/ diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 651c7fb590f..399fab67aa5 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -1,5 +1,5 @@ /obj/structure/sign/double/barsign - icon = 'barsigns.dmi' + icon = 'icons/obj/barsigns.dmi' icon_state = "empty" anchored = 1 New() 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 d4c55f475a8..7339c88646d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -112,7 +112,7 @@ /obj/item/roller name = "roller bed" desc = "A collapsed roller bed that can be carried around." - icon = 'rollerbed.dmi' + icon = 'icons/obj/rollerbed.dmi' icon_state = "folded" w_class = 4.0 // Can't be put in backpacks. Oh well. diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 28791229725..bb38bbcd854 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -105,12 +105,12 @@ if(reinf) new /obj/item/stack/rods(loc) del(src) else if (usr.a_intent == "hurt") - playsound(src.loc, 'glassknock.ogg', 80, 1) + playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("\red [usr.name] bangs against the [src.name]!", \ "\red You bang against the [src.name]!", \ "You hear a banging sound.") else - playsound(src.loc, 'glassknock.ogg', 80, 1) + playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("[usr.name] knocks on the [src.name].", \ "You knock on the [src.name].", \ "You hear a knocking sound.") diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 6e35204691b..6bd631e88f3 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -1,10 +1,10 @@ /obj/structure/shuttle name = "shuttle" - icon = 'shuttle.dmi' + icon = 'icons/turf/shuttle.dmi' /obj/structure/shuttle/window name = "shuttle window" - icon = 'podwindows.dmi' + icon = 'icons/obj/podwindows.dmi' icon_state = "1" density = 1 opacity = 0 diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index db92e15f4ae..e1ec717d30c 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -140,4 +140,4 @@ if((mineral == "gold") || (mineral == "silver")) if(shocked) shock() -*/ +*/ diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7f821923415..355fe221fc4 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -354,13 +354,13 @@ var/list/admin_verbs_mod = list( mob.invisibility = initial(mob.invisibility) mob << "\red Invisimin off. Invisibility reset." mob.icon_state = "ghost" - mob.icon = 'human.dmi' + mob.icon = 'icons/mob/human.dmi' mob.update_icons() else mob.invisibility = INVISIBILITY_OBSERVER mob << "\blue Invisimin on. You are now as invisible as a ghost." mob.icon_state = "ghost" - mob.icon = 'mob.dmi' + mob.icon = 'icons/mob/mob.dmi' /client/proc/player_panel() diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 3bd563aaf58..5b805ac8bd0 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -12,8 +12,8 @@ Permissions Panel - - + +
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index ce338bfd3e6..20a3862300f 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -62,7 +62,7 @@ client/proc/space_asshole() for(var/mob/M in world) if(M.client) if(M.client.midis) - M << 'space_asshole.ogg' + M << 'sound/music/space_asshole.ogg' client/proc/honk_theme() diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index f5ead1fa839..65a0e0aa8cc 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -483,7 +483,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if("No") world << "\red New NanoTrasen Update available at all communication consoles." - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report", 1) feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 5795e8c7141..aed3517d03a 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1,7 +1,7 @@ /obj/item/clothing/glasses name = "glasses" - icon = 'glasses.dmi' + icon = 'icons/obj/clothing/glasses.dmi' //w_class = 2.0 //flags = GLASSESCOVERSEYES //slot_flags = SLOT_EYES diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 42307b17080..78d30945154 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -3,7 +3,7 @@ // Clothing item_state doesn't use custom_items.dmi. Just add them to the normal clothing files. /obj/item/fluff // so that they don't spam up the object tree - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' w_class = 1.0 ////////////////////////////////// @@ -88,7 +88,7 @@ /obj/item/weapon/book/fluff/johnathan_falcian_1 name = "sketchbook" desc = "A small, well-used sketchbook." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "johnathan_notebook" dat = "In the notebook there are numerous drawings of various crew-mates, locations, and scenes on the ship. They are of fairly good quality." author = "Johnathan Falcian" @@ -101,7 +101,7 @@ /obj/item/weapon/folder/blue/fluff/matthew_riebhardt //Matthew Riebhardt - ZekeSulastin name = "academic journal" desc = "An academic journal, seemingly pertaining to medical genetics. This issue is for the second quarter of 2557. Paper flags demarcate some articles the owner finds interesting." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "matthewriebhardt" /obj/item/weapon/pen/fluff/multi //spaceman96: Trenna Seber @@ -111,19 +111,19 @@ /obj/item/weapon/pen/fluff/fancypen //orangebottle: Lillian Levett, Lilliana Reade name = "fancy pen" desc = "A fancy metal pen. It uses blue ink. An inscription on one side reads,\"L.L. - L.R.\"" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "fancypen" /obj/item/weapon/pen/fluff/eugene_bissegger_1 //metamorp: eugene bisseger name = "Gilded Pen" desc = "A golden pen that is gilded with a meager amount of gold material. The word 'NanoTrasen' is etched on the clip of the pen." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "eugene_pen" /obj/item/weapon/pen/fluff/fountainpen //paththegreat: Eli Stevens name = "Engraved Fountain Pen" desc = "An expensive looking pen with the initials E.S. engraved into the side." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "fountainpen" /obj/item/fluff/victor_kaminsky_1 //chinsky: Victor Kaminski @@ -154,46 +154,46 @@ /obj/item/weapon/soap/fluff/azare_siraj_1 //mister fox: Azare Siraj name = "S'randarr's Tongue Leaf" desc = "A waxy, scentless leaf." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "siraj_tongueleaf" item_state = "siraj_tongueleaf" /obj/item/weapon/clipboard/fluff/smallnote //lexusjjss: Lexus Langg, Zachary Tomlinson name = "small notebook" desc = "A generic small spiral notebook that flips upwards." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "smallnotetext" item_state = "smallnotetext" /obj/item/weapon/storage/fluff/maye_daye_1 //morrinn: Maye Day name = "pristine lunchbox" desc = "A pristine stainless steel lunch box. The initials M.D. are engraved on the inside of the lid." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "maye_daye_1" /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/william_hackett name = "handmade flask" desc = "A wooden flask with a silver lid and bottom. It has a matte, dark blue paint on it with the initials \"W.H.\" etched in black." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "williamhackett" /obj/item/weapon/storage/firstaid/fluff/asus_rose //Kerbal22 - Asus Rose name = "rugged medkit" desc = "A dinged up medkit, it seems to have seen quite a bit of use." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "asusrose" /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1 //leonheart11: Johann Erzatz name = "vintage thermos" desc = "An older thermos with a faint shine." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "johann_erzatz_1" volume = 50 /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda name = "blue zippo lighter" desc = "A zippo lighter made of some blue metal." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "bluezippo" icon_on = "bluezippoon" icon_off = "bluezippo" @@ -201,7 +201,7 @@ /obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess name = "engraved lighter" desc = "A golden lighter, engraved with some ornaments and a G." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "guessip" icon_on = "guessipon" icon_off = "guessip" @@ -209,7 +209,7 @@ /obj/item/weapon/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 = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "blackzippo" icon_on = "blackzippoon" icon_off = "blackzippo" @@ -217,7 +217,7 @@ /obj/item/weapon/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 = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "gradzippo" icon_on = "gradzippoon" icon_off = "gradzippo" @@ -225,7 +225,7 @@ /obj/item/weapon/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 = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "gonzozippo" icon_on = "gonzozippoon" icon_off = "gonzozippo" @@ -233,7 +233,7 @@ /obj/item/weapon/lighter/zippo/fluff/naples_1 //naples: Russell Vierson name = "Engraved zippo" desc = "A intricately engraved Zippo lighter." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "engravedzippo" icon_on = "engravedzippoon" icon_off = "engravedzippo" @@ -242,7 +242,7 @@ name = "purple comb" desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side." w_class = 1.0 - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "purplecomb" item_state = "purplecomb" @@ -255,12 +255,12 @@ /obj/item/weapon/fluff/hugo_cinderbacth_1 //thatoneguy: Hugo Cinderbatch name = "Old Cane" desc = "An old brown cane made from wood. It has a a large, itallicized H on it's handle." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "special_cane" /obj/item/device/camera/fluff/orange //chinsky: Summer Springfield name = "orange camera" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black." icon_state = "orangecamera" icon_on = "orangecamera" @@ -269,7 +269,7 @@ /obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash name = "Old Camera" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue." icon_state = "oldcamera" icon_on = "oldcamera" @@ -280,26 +280,26 @@ name = "ID wallet" desc = "A wallet made of black leather, holding an ID and a gold badge that reads 'NT.' The ID has a small picture of a man, with the caption Reese James MacKenzie, with other pieces of information to the right of the picture." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "reesemackenzie" /obj/item/weapon/card/id/fluff/lifetime //fastler: Fastler Greay; it seemed like something multiple people would have name = "Lifetime ID Card" desc = "A modified ID card given only to those people who have devoted their lives to the better interests of NanoTrasen. It sparkles blue." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "lifetimeid" /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask //lexusjjss: Lexus Langg & Zachary Tomlinson name = "shiny flask" desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "shinyflask" volume = 50 /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask //mcgulliver: Wox Derax name = "Lithium Flask" desc = "A flask with a Lithium Atom symbol on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "lithiumflask" volume = 50 @@ -314,7 +314,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/fluff/eleanor_stone //Rkf45: Eleanor Stone name = "teapot" desc = "An elegant teapot. The engraving on the bottom reads 'ENS'" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "eleanorstone" item_state = "eleanorstone" @@ -348,7 +348,7 @@ /obj/item/clothing/mask/fluff/electriccig //CubeJackal: Barry Sharke name = "Electronic cigarette" desc = "An electronic cigarette. Most of the relief of a real cigarette with none of the side effects. Often used by smokers who are trying to quit the habit." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "cigon" throw_speed = 0.5 item_state = "ciglit" @@ -361,7 +361,7 @@ /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1 name = "strange penlight" desc = "Besides the coloring, this penlight looks rather normal and innocent. However, you get a nagging feeling whenever you see it..." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "asher_spock_1" amount_per_transfer_from_this = 5 volume = 15 @@ -414,27 +414,27 @@ /obj/item/weapon/card/id/fluff/asher_spock_2 //Nerezza: Asher Spock name = "Odysses Specialist ID card" desc = "A special identification card with a red cross signifying an emergency physician has specialised in Odysseus operations and maintenance.\nIt grants the owner recharge bay access." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "odysseus_spec_id" /obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary name = "McReary's journal" desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "mcreary_journal" item_state = "mcreary_journal" /obj/item/device/flashlight/fluff/thejesster14_1 //thejesster14: Rosa Wolff name = "old red flashlight" desc = "A very old, childlike flashlight." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "wolfflight" item_state = "wolfflight" /obj/item/weapon/crowbar/fluff/zelda_creedy_1 //daaneesh: Zelda Creedy name = "Zelda's Crowbar" desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "zeldacrowbar" item_state = "crowbar" @@ -443,7 +443,7 @@ /obj/item/weapon/paintkit/fluff/butcher_royce_1 name = "Ripley customisation kit" desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into a Titan's Fist worker mech." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "royce_kit" new_name = "APLU \"Titan's Fist\"" @@ -456,7 +456,7 @@ /obj/item/weapon/paintkit/fluff/sven_fjeltson_1 name = "Mercenary APLU kit" desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into an old Mercenaries APLU." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "sven_kit" new_name = "APLU \"Strike the Earth!\"" @@ -482,7 +482,7 @@ /obj/item/clothing/gloves/fluff/walter_brooks_1 //botanistpower: Walter Brooks name = "mittens" desc = "A pair of well worn, blue mittens." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "walter_brooks_1" item_state = "bluegloves" color="blue" @@ -490,13 +490,13 @@ /obj/item/clothing/gloves/fluff/chal_appara_1 //furlucis: Chal Appara name = "Left Black Glove" desc = "The left one of a pair of black gloves. Wonder where the other one went..." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "chal_appara_1" /obj/item/clothing/gloves/fluff/ashley_rifler_1 //Vinceluk: Ashley Rifler name = "Purple Glove" desc = "A single, purple glove. Initials A.R. are written on the inside of it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ashley_rifler_1" //////////// Eye Wear //////////// @@ -504,13 +504,13 @@ /obj/item/clothing/glasses/meson/fluff/book_berner_1 //asanadas: Book Berner name = "bespectacled mesonic surveyors" desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "book_berner_1" /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra name = "Scanning Goggles" desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "uzenwa_sissra_1" ////// Medical eyepatch - Thysse Ezinwa - Jadepython @@ -522,7 +522,7 @@ /obj/item/clothing/glasses/fluff/arjun_chopra_1 name = "safety goggles" desc = "A used pair of leather safety goggles." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "arjun_chopra" item_state = "arjun_chopra" @@ -531,49 +531,49 @@ /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard name = "\improper SWAT hat" desc = "A black hat. The inside has the words, \"Lieutenant James Girard, LPD SWAT Team Four.\"" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "swatcap" /obj/item/clothing/head/welding/fluff/alice_mccrea_1 //madmalicemccrea: Alice McCrea name = "flame decal welding helmet" desc = "A welding helmet adorned with flame decals, and several cryptic slogans of varying degrees of legibility. \"Fly the Friendly Skies\" is clearly visible, written above the visor, for some reason." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "alice_mccrea_1" /obj/item/clothing/head/welding/fluff/yuki_matsuda_1 //searif: Yuki Matsuda name = "white decal welding helmet" desc = "A white welding helmet with a character written across it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "yuki_matsuda_1" /obj/item/clothing/head/welding/fluff/norah_briggs_1 //bountylord13: Norah Briggs name = "blue flame decal welding helmet" desc = "A welding helmet with blue flame decals on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "norah_briggs_1" /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 //themij: Taryn Kifer name = "orange bandana" desc = "Hey, I think we're missing a hazard vest..." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "taryn_kifer_1" /obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor name = "Edvin's Hat" desc = "A hat specially tailored for Skrellian anatomy. It has a yellow badge on the front, with a large red 'T' inscribed on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "edvin_telephosphor_1" /obj/item/clothing/head/fluff/krinnhat //Shirotyrant: Krinn Seeskale name = "saucepan hat" desc = "This hat is the shiniest shiny Krinn has ever owned." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "krinn_hat" /obj/item/clothing/head/fluff/bruce_hachert //Stup1dg33kz: Bruce Hachert name = "worn hat" desc = "A worn-looking hat. It is slightly faded in color." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "brucehachert" //////////// Suits //////////// @@ -581,19 +581,19 @@ /obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Robotics Labcoat - Aeneas Rinil [APPR] name = "Robotics labcoat" desc = "A labcoat with a few markings denoting it as the labcoat of roboticist." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "aeneasrinil_open" /obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber name = "pink labcoat" desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_pink_open" /obj/item/clothing/suit/storage/det_suit/fluff/graycoat //vinceluk: Seth Sealis name = "gray coat" desc = "Old, worn out coat. It's seen better days." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "graycoat" item_state = "graycoat" color = "graycoat" @@ -601,7 +601,7 @@ /obj/item/clothing/suit/storage/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis name = "leather jacket" desc = "A black leather coat, popular amongst punks, greasers, and other galactic scum." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "leatherjack" item_state = "leatherjack" color = "leatherjack" @@ -609,7 +609,7 @@ /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl name = "blue shield security armor" desc = "An armored vest with the badge of a Blue Shield Security lieutenant." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "deus_blueshield" item_state = "deus_blueshield" @@ -626,7 +626,7 @@ /obj/item/clothing/under/fluff/milo_hachert //Field Dress Uniform - Milo Hachert - Commissar_Drew name = "field dress uniform" desc = "A uniform jacket, its buttons polished to a shine, coupled with a dark pair of trousers. 'Hachert' is embroidered upon the jacket’s shoulder bar." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "milohachert" item_state = "milohachert" color = "milohachert" @@ -634,7 +634,7 @@ /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda name = "rolled down jumpsuit" desc = "A rolled down jumpsuit. Great for mechanics." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "jumpsuitdown" item_state = "jumpsuitdown" color = "jumpsuitdown" @@ -642,7 +642,7 @@ /obj/item/clothing/under/fluff/lilith_vinous_1 //slyhidden: Lilith Vinous name = "casual security uniform" desc = "A less formal version of the traditional dark red Security uniform. It has the top button undone, rolled up sleeves and different belt." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "lilith_uniform" item_state = "lilith_uniform" color = "lilith_uniform" @@ -650,7 +650,7 @@ /obj/item/clothing/under/fluff/ana_issek_1 //suethecake: Ana Issek name = "retired uniform" desc = "A silken blouse paired with dark-colored slacks. It has the words 'Chief Investigator' embroidered into the shoulder bar." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ana_uniform" item_state = "ana_uniform" color = "ana_uniform" @@ -658,7 +658,7 @@ /obj/item/clothing/under/fluff/olddressuniform //desiderium: Momiji Inubashiri name = "retired dress uniform" desc = "A retired Station Head of Staff uniform, phased out twenty years ago for the newer jumpsuit design, but still acceptable dress. Lovingly maintained." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "olddressuniform" item_state = "olddressuniform" color = "olddressuniform" @@ -666,14 +666,14 @@ /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 //whitewolf41: Jeremy Wolf name = "worn officer's uniform" desc = "An old red security jumpsuit. Seems to have some slight modifications." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "jeremy_wolf_1" color = "jeremy_wolf_1" /obj/item/clothing/under/fluff/tian_dress //phaux: Tian Yinhu name = "purple dress" desc = "A nicely tailored purple dress made for the taller woman." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "tian_dress" item_state = "tian_dress" color = "tian_dress" @@ -681,7 +681,7 @@ /obj/item/clothing/under/rank/bartender/fluff/classy //searif: Ara Al-Jazari name = "classy bartender uniform" desc = "A prim and proper uniform that looks very similar to a bartender's, the only differences being a red tie, waistcoat and a rag hanging out of the back pocket." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ara_bar_uniform" item_state = "ara_bar_uniform" color = "ara_bar_uniform" @@ -689,7 +689,7 @@ /obj/item/clothing/under/fluff/callum_suit //roaper: Callum Leamus name = "knockoff suit" desc = "A knockoff of a suit commonly worn by the upper class." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "callum_suit" item_state = "callum_suit" color = "callum_suit" @@ -697,7 +697,7 @@ /obj/item/clothing/under/fluff/solara_light_1 //bluefishie: Solara Born-In-Light name = "Elaborate Purple Dress" desc = "An expertly tailored dress, made out of fine fabrics. The interwoven necklace appears to be made out of gold, with three complicated symbols engraved in the front." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "solara_dress" item_state = "solara_dress" color = "solara_dress" @@ -741,7 +741,7 @@ name = "ex-commander jumpsuit" desc = "A standard Central Command Engineering Commander jumpsuit tailored to fight the wearer tightly. It has a Medal of Service pinned onto the left side of it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "wyatt_uniform" item_state = "wyatt_uniform" color = "wyatt_uniform" @@ -752,7 +752,7 @@ /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell name = "\improper First Nations facemask" desc = "A simple cloth rag that bears the flag of the first nations." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "flagmask" item_state = "flagmask" flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH @@ -763,7 +763,7 @@ /obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick name = "shamrock pendant" desc = "A silver and emerald shamrock pendant. It has the initials \"M.K.\" engraved on the back." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "mara_kilpatrick_1" flags = FPRINT|TABLEPASS w_class = 1 @@ -773,7 +773,7 @@ /obj/item/clothing/tie/fluff/altair_locket name = "small locket" desc = "A small golden locket attached to an Ii'rka-reed string. Inside the locket is a holo-picture of a female Tajaran, and an inscription writtin in Siik'mas." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "altair_locket" item_state = "altair_locket" color = "altair_locket" @@ -787,7 +787,7 @@ /obj/item/clothing/tie/fluff/konaa_hirano name = "silver locket" desc = "This oval shaped, argentium sterling silver locket hangs on an incredibly fine, refractive string, almost thin as hair and microweaved from links to a deceptive strength, of similar material. The edges are engraved very delicately with an elegant curving design, but overall the main is unmarked and smooth to the touch, leaving room for either remaining as a stolid piece or future alterations. There is an obvious internal place for a picture or lock of some sort, but even behind that is a very thin compartment unhinged with the pinch of a thumb and forefinger." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "konaahirano" item_state = "konaahirano" color = "konaahirano" @@ -820,7 +820,7 @@ /obj/item/clothing/tie/fluff/nasir_khayyam_1 name = "medallion" desc = "This silvered medallion bears the symbol of the Hadii Clan of the Tajaran." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "nasir_khayyam_1" flags = FPRINT|TABLEPASS w_class = 1 @@ -831,7 +831,7 @@ /obj/item/clothing/mask/mara_kilpatrick_1 name = "emerald necklace" desc = "A brass necklace with a green emerald placed at the end. It has a small inscription on the top of the chain, saying \'Foster\'" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ty_foster" flags = FPRINT|TABLEPASS w_class = 1 @@ -841,7 +841,7 @@ /obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris name = "Susan's Magboots" desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "atmosmagboots0" //////////// Sets //////////// @@ -850,7 +850,7 @@ /obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat name = "\improper CDC labcoat" desc = "A standard-issue CDC labcoat that protects against minor chemical spills. It has the name \"Wiles\" sewn on to the breast pocket." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_cdc_open" */ ////// Short Sleeve Medical Outfit //erthilo: Farah Lants @@ -858,14 +858,14 @@ /obj/item/clothing/under/rank/medical/fluff/short name = "short sleeve medical jumpsuit" desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personnel and short sleeves." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "medical_short" color = "medical_short" /obj/item/clothing/suit/storage/labcoat/fluff/red name = "red labcoat" desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_red_open" ////// Retired Patrol Outfit //desiderium: Rook Maudlin @@ -873,7 +873,7 @@ /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat name = "retired colony patrolman's coat" desc = "A clean, black nylon windbreaker with the words \"OUTER LIGHT POLICE\" embroidered in gold-dyed thread on the back. \"RETIRED\" is tastefully embroidered below in a smaller font." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "retpolcoat" item_state = "retpolcoat" color = "retpolcoat" @@ -881,13 +881,13 @@ /obj/item/clothing/head/det_hat/fluff/retpolcap name = "retired colony patrolman's cap" desc = "A clean and properly creased colony police cap. The badge is shined and polished, the word \"RETIRED\" engraved professionally under the words \"OUTER LIGHT POLICE.\"" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "retpolcap" /obj/item/clothing/under/det/fluff/retpoluniform name = "retired colony patrolman's uniform" desc = "A meticulously clean police uniform belonging to Precinct 31, Outer Light Colony. The word \"RETIRED\" is engraved tastefully and professionally in the badge below the number, 501." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "retpoluniform" color = "retpoluniform" @@ -903,7 +903,7 @@ /obj/item/weapon/gun/projectile/detective/fluff/callum_leamas name = "Deckard .44" desc = "A custom built revolver, based off the semi-popular Detective Special model." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "leamas-empty" /obj/item/weapon/gun/projectile/detective/fluff/callum_leamas/update_icon() diff --git a/code/modules/ext_scripts/github.dm b/code/modules/ext_scripts/github.dm new file mode 100644 index 00000000000..e69de29bb2d diff --git a/code/modules/icon generation/Icon_color_animation.dm b/code/modules/icon generation/Icon_color_animation.dm index 9681722fcb3..1be1bfa28a9 100644 --- a/code/modules/icon generation/Icon_color_animation.dm +++ b/code/modules/icon generation/Icon_color_animation.dm @@ -83,7 +83,7 @@ //---------------------------------------- /proc/generate_color_animation(icon/icon, list/colors, list/frames) - var/icon/out = icon('uristrunes.dmi', "") + var/icon/out = icon('icons/effects/uristrunes.dmi', "") var/frame_num = 1 for(var/frame in frames) diff --git a/code/modules/icon generation/Uristrunes.dm b/code/modules/icon generation/Uristrunes.dm index 3f33f8fed53..d9c129df8ed 100644 --- a/code/modules/icon generation/Uristrunes.dm +++ b/code/modules/icon generation/Uristrunes.dm @@ -9,7 +9,7 @@ //---------------------------------------- /proc/create_border_image(icon/input, border_color = "#000000", fill_color = "#000000", border_alpha = 255, fill_alpha = 255) - var/icon/I = icon('uristrunes.dmi', "blank") + var/icon/I = icon('icons/effects/uristrunes.dmi', "blank") I.Blend(input, ICON_OVERLAY) //Discard the image @@ -176,11 +176,11 @@ var/list/rune_animation = list( if(lookup in rune_cache) return rune_cache[lookup] - var/icon/base = icon('uristrunes.dmi', "") + var/icon/base = icon('icons/effects/uristrunes.dmi', "") for(var/i = 0, i < 10, i++) if(rune_bits & (1 << i)) - base.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) + base.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) var/icon/result @@ -214,23 +214,23 @@ var/list/rune_animation = list( /* /mob/verb/create_rune_custom(rune as num, color1 as color, border1 as color, color2 as color, border2 as color, alpha1 as num, alpha2 as num) - var/icon/I = icon('uristrunes.dmi', "blank") + var/icon/I = icon('icons/effects/uristrunes.dmi', "blank") for(var/i = 0, i < 10, i++) if(rune & (1 << i)) - I.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) + I.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) var/obj/o = new(locate(x, y, z)) o.icon = animate_rune(I, color1, border1, color2, border2, alpha1, alpha2) /mob/verb/spam() for(var/turf/t in range(4)) - var/icon/I = icon('uristrunes.dmi', "blank") + var/icon/I = icon('icons/effects/uristrunes.dmi', "blank") var/rune = rand(1, 1023) for(var/i = 0, i < 10, i++) if(rune & (1 << i)) - I.Blend(icon('uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) + I.Blend(icon('icons/effects/uristrunes.dmi', "rune-[1 << i]"), ICON_OVERLAY) var/obj/o = new(t) o.icon = animate_rune_full(I, rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), diff --git a/code/modules/mob/living/carbon/alien/special/snakeman.dm b/code/modules/mob/living/carbon/alien/special/snakeman.dm index d9829dee2be..7aa7b9d5db0 100644 --- a/code/modules/mob/living/carbon/alien/special/snakeman.dm +++ b/code/modules/mob/living/carbon/alien/special/snakeman.dm @@ -43,7 +43,7 @@ /obj/effect/snake_egg name = "Egg" - icon = 'alien.dmi' + icon = 'icons/mob/alien.dmi' icon_state = "egg" density = 1 anchored = 1 diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 6f10e8af792..a2cc5d21a9a 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -20,4 +20,4 @@ //Active emote/pose var/pose = null - var/pulse = PULSE_NORM //current pulse level + var/pulse = PULSE_NORM //current pulse level diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 49242c64de1..02b233bb440 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -164,7 +164,7 @@ var/global/list/damage_icon_parts = list() proc/get_damage_icon_part(damage_state, body_part) if(damage_icon_parts["[damage_state]/[body_part]"] == null) var/icon/DI = new /icon('icons/mob/dam_human.dmi', damage_state) // the damage icon for whole human - DI.Blend(new /icon('dam_mask.dmi', body_part), ICON_MULTIPLY) // mask with this organ's pixels + DI.Blend(new /icon('icons/mob/dam_mask.dmi', body_part), ICON_MULTIPLY) // mask with this organ's pixels damage_icon_parts["[damage_state]/[body_part]"] = DI return DI else @@ -187,8 +187,8 @@ proc/get_damage_icon_part(damage_state, body_part) previous_damage_appearance = damage_appearance - var/icon/standing = new /icon('dam_human.dmi', "00") - var/icon/lying = new /icon('dam_human.dmi', "00-2") + var/icon/standing = new /icon('icons/mob/dam_human.dmi', "00") + var/icon/lying = new /icon('icons/mob/dam_human.dmi', "00-2") var/image/standing_image = new /image("icon" = standing) var/image/lying_image = new /image("icon" = lying) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index cc10e646dd6..e3fa19a088d 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -124,11 +124,11 @@ /obj/item/broken_device name = "broken component" - icon = 'robot_component.dmi' + icon = 'icons/robot_component.dmi' icon_state = "broken" /obj/item/robot_parts/robot_component - icon = 'robot_component.dmi' + icon = 'icons/robot_component.dmi' icon_state = "working" construction_time = 200 construction_cost = list("metal"=5000) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 6b94c52c6da..6bf18971ba6 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -191,7 +191,7 @@ if (istype(module,/obj/item/weapon/robot_module/security)) message = "[src] shows its legal authorization barcode." - playsound(src.loc, 'biamthelaw.ogg', 50, 0) + playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0) m_type = 2 else src << "You are not THE LAW, pal." diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm index eeb66f46a25..e512a6cccee 100644 --- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm +++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm @@ -4,7 +4,7 @@ /obj/item/borg/upgrade/ name = "A borg upgrade module." desc = "Protected by FRM." - icon = 'module.dmi' + icon = 'icons/obj/module.dmi' icon_state = "cyborg_upgrade" var/construction_time = 120 var/construction_cost = list("metal"=10000) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index e1e0a0eea40..5df52388a8c 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -472,4 +472,4 @@ spawn(0) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) dir = i - sleep(1) + sleep(1) diff --git a/code/modules/mob/living/simple_animal/kobold.dm b/code/modules/mob/living/simple_animal/kobold.dm index acf1fa1ea7c..3d9515c88b6 100644 --- a/code/modules/mob/living/simple_animal/kobold.dm +++ b/code/modules/mob/living/simple_animal/kobold.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/kobold name = "kobold" desc = "A small, rat-like creature." - icon = 'mob.dmi' + icon = 'icons/mob/mob.dmi' icon_state = "kobold_idle" icon_living = "kobold_idle" icon_dead = "kobold_dead" diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 08aad3d7ad6..5c833ff8aa2 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -960,4 +960,4 @@ mob/verb/yank_out_object() pinned -= O if(!pinned.len) anchored = 0 - return 1 + return 1 diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index 5742b95cb2d..b36e3e7516a 100644 --- a/code/modules/mob/screen.dm +++ b/code/modules/mob/screen.dm @@ -77,7 +77,7 @@ /obj/screen/gun name = "gun" - icon = 'screen1.dmi' + icon = 'icons/mob/screen1.dmi' master = null dir = 2 diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index c8a32cabb1b..3a47ec7abf2 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -6,7 +6,7 @@ /obj/machinery/computer/am_engine name = "Antimatter Engine Console" - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "comm_computer" req_access = list(ACCESS_ENGINE) var/engine_id = 0 diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index 824e3fe0e89..77512fb5b0b 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -1,5 +1,5 @@ /obj/machinery/power/am_engine - icon = 'AM_Engine.dmi' + icon = 'icons/am_engine.dmi' density = 1 anchored = 1.0 flags = ON_BORDER diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index dc261110b00..f4250bf9378 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -1,7 +1,7 @@ /obj/item/weapon/fuel name = "Magnetic Storage Ring" desc = "A magnetic storage ring." - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "rcdammo" opacity = 0 density = 0 diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 4aa6e60525f..89d65a6ae21 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -92,7 +92,7 @@ else if(!active) if(istype(O, /obj/item/weapon/wrench)) anchored = !anchored - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) user << "\blue You secure the generator to the floor." else @@ -100,7 +100,7 @@ makepowernets() else if(istype(O, /obj/item/weapon/screwdriver)) open = !open - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(open) user << "\blue You open the access panel." else diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 412ff260ecc..240fbc25eb7 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -93,4 +93,4 @@ /obj/item/ammo_casing/a762 desc = "A 7.62 bullet casing." caliber = "a762" - projectile_type = "/obj/item/projectile/bullet" + projectile_type = "/obj/item/projectile/bullet" diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index f22653cb623..fb506def213 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -41,4 +41,4 @@ if(modifystate) icon_state = "[modifystate][ratio]" else - icon_state = "[initial(icon_state)][ratio]" + icon_state = "[initial(icon_state)][ratio]" diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index fa982c1de7d..b8905e1ae25 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -157,7 +157,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. else return for(var/mob/living/K in viewers(usr)) - K << 'TargetOn.ogg' + K << 'sound/weapons/TargetOn.ogg' if(!targeted_by) targeted_by = list() targeted_by += I @@ -214,7 +214,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I) if(!I.silenced) for(var/mob/living/M in viewers(src)) - M << 'TargetOff.ogg' + M << 'sound/weapons/TargetOff.ogg' targeted_by -= I I.target.Remove(src) //De-target them if(!I.target.len) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 9435fee6a01..3f05c23582e 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -395,9 +395,9 @@ spawn() has_sprites += user.client for(var/i = 1 to MAX_PILL_SPRITE) - usr << browse_rsc(icon('chemical.dmi', "pill" + num2text(i)), "pill[i].png") + usr << browse_rsc(icon('icons/obj/chemical.dmi', "pill" + num2text(i)), "pill[i].png") for(var/i = 1 to MAX_BOTTLE_SPRITE) - usr << browse_rsc(icon('chemical.dmi', "bottle" + num2text(i)), "bottle[i].png") + usr << browse_rsc(icon('icons/obj/chemical.dmi', "bottle" + num2text(i)), "bottle[i].png") var/dat = "" if(!beaker) dat = "Please insert beaker.
" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 130ea2ba7ac..1dffb8209a1 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -104,4 +104,4 @@ empty = 0 if(empty) - usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more." + usr << "\blue It is currently empty. Allow some time for the internal syntheszier to produce more." diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 93cb2356495..83196d384b6 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -214,4 +214,4 @@ New() ..() - reagents.add_reagent("virusfood", 1000) + reagents.add_reagent("virusfood", 1000) diff --git a/code/modules/research/research_shuttle.dm b/code/modules/research/research_shuttle.dm index 1fe54587498..91c1464d36b 100644 --- a/code/modules/research/research_shuttle.dm +++ b/code/modules/research/research_shuttle.dm @@ -62,7 +62,7 @@ proc/move_research_shuttle() /obj/machinery/computer/research_shuttle name = "Research Shuttle Console" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "shuttle" req_access = list(access_research) circuit = "/obj/item/weapon/circuitboard/research_shuttle" @@ -105,7 +105,7 @@ proc/move_research_shuttle() usr << "You fried the consoles ID checking system. It's now available to everyone!" else if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/research_shuttle/M = new /obj/item/weapon/circuitboard/research_shuttle( A ) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm index d5cd7a7b504..0f47eeb1106 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm @@ -1,7 +1,7 @@ /obj/structure/crystal name = "large crystal" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "crystal" density = 1 diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm index 089c9084189..63999f99217 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm @@ -2,7 +2,7 @@ /obj/machinery/replicator name = "alien machine" desc = "It's some kind of pod with strange wires and gadgets all over it." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "borgcharger0(old)" density = 1 diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index 2b52d2cbb19..0030e31b21e 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -60,7 +60,7 @@ var/list/valid_secondary_effect_types = list(\ /obj/machinery/artifact name = "alien artifact" desc = "A large alien device." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano00" var/icon_num = 0 density = 1 diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm index a313c56b967..3c779caa967 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm @@ -12,7 +12,7 @@ /obj/machinery/artifact name = "alien artifact" desc = "A large alien device." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano00" var/icon_num = 0 anchored = 0 diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 8a03866d36f..7464e7c8b06 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -26,7 +26,7 @@ /obj/item/weapon/ore/strangerock name = "Strange rock" desc = "Seems to have some unusal strata evident throughout it." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "strange" var/obj/item/weapon/inside var/method = 0// 0 = fire, 1 = brush, 2 = pick @@ -80,7 +80,7 @@ /obj/item/weapon/archaeological_find name = "object" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano01" var/find_type = 0 @@ -114,7 +114,7 @@ if(1) item_type = "bowl" new_item = new /obj/item/weapon/reagent_containers/glass(src.loc) - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "bowl" apply_image_decorations = 1 if(prob(20)) @@ -122,7 +122,7 @@ if(2) item_type = "urn" new_item = new /obj/item/weapon/reagent_containers/glass(src.loc) - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "urn" apply_image_decorations = 1 if(prob(20)) @@ -192,7 +192,7 @@ if(11) item_type = "box" new_item = new /obj/item/weapon/storage/box(src.loc) - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "box" if(prob(30)) apply_image_decorations = 1 @@ -271,7 +271,7 @@ new_item = new /obj/item/device/radio/beacon(src.loc) talkative = 0 new_item.icon_state = "unknown[rand(1,4)]" - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.desc = "" if(19) apply_prefix = 0 @@ -351,7 +351,7 @@ var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc) new_item = new_gun new_item.icon_state = "gun[rand(1,4)]" - new_item.icon = 'xenoarchaeology.dmi' + new_item.icon = 'icons/obj/xenoarchaeology.dmi' //33% chance to be able to reload the gun with human ammunition if(prob(66)) @@ -420,7 +420,7 @@ //humanoid remains apply_prefix = 0 item_type = "humanoid [pick("remains","skeleton")]" - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "remains" additional_desc = pick("They appear almost human.",\ "They are contorted in a most gruesome way.",\ @@ -435,7 +435,7 @@ //robot remains apply_prefix = 0 item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]" - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "remainsrobot" additional_desc = pick("Almost mistakeable for the remains of a modern cyborg.",\ "They are barely recognisable as anything other than a pile of waste metals.",\ @@ -450,7 +450,7 @@ //xenos remains apply_prefix = 0 item_type = "alien [pick("remains","skeleton")]" - icon = 'blood.dmi' + icon = 'icons/effects/blood.dmi' icon_state = "remainsxeno" additional_desc = pick("It looks vaguely reptilian, but with more teeth.",\ "They are faintly unsettling.",\ diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm index bd2e87fe83c..89fc33396d2 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm @@ -4,7 +4,7 @@ /obj/item/weapon/fossil name = "Fossil" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "bone" desc = "It's a fossil." @@ -44,7 +44,7 @@ /obj/skeleton name = "Incomplete skeleton" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "uskel" desc = "Incomplete skeleton." var/bnum = 1 diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm index 6b995deff42..64184ec0b6f 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm @@ -40,7 +40,7 @@ //legacy crystal /obj/machinery/crystal name = "Crystal" - icon = 'mining.dmi' + icon = 'icons/obj/mining.dmi' icon_state = "crystal" /obj/machinery/crystal/New() diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm index 22b67101d9c..91d5f1bd62c 100644 --- a/code/modules/research/xenoarchaeology/geosample.dm +++ b/code/modules/research/xenoarchaeology/geosample.dm @@ -17,7 +17,7 @@ /obj/item/weapon/rocksliver name = "rock sliver" desc = "It looks extremely delicate." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "sliver1" //0-4 w_class = 1 //item_state = "electronic" diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm index 70fde828dfe..9b37d20df91 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm @@ -4,7 +4,7 @@ obj/machinery/anomaly/ion_mobility name = "Ion Mobility Spectrometer" desc = "A specialised, complex analysis machine." - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" obj/machinery/anomaly/ion_mobility/ScanResults() diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm index 604015d31c3..04efb278ad9 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm @@ -4,7 +4,7 @@ obj/machinery/anomaly/isotope_ratio name = "Isotope ratio spectrometer" desc = "A specialised, complex analysis machine." - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" obj/machinery/anomaly/isotope_ratio/ScanResults() diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm index 706343e8f62..ff1415997b1 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm @@ -4,7 +4,7 @@ /obj/machinery/artifact_analyser name = "Artifact Analyser" desc = "Studies the structure of artifacts to discover their uses." - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" anchored = 1 density = 1 @@ -302,7 +302,7 @@ /obj/machinery/analyser_pad name = "artifact analysis pad" desc = "Studies the structure of artifacts to discover their uses." - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "tele0" anchored = 1 density = 0 diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm index 426b9165a13..117be557daf 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm @@ -1,7 +1,7 @@ /obj/machinery/artifact_harvester name = "Exotic Particle Harvester" - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "incubator" //incubator_on anchored = 1 density = 1 diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm b/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm index cb03b91c276..3d440bf85ab 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm @@ -2,7 +2,7 @@ /obj/machinery/artifact_scanpad name = "Anomaly Scanner Pad" desc = "Place things here for scanning." - icon = 'stationobjs.dmi' + icon = 'icons/obj/stationobjs.dmi' icon_state = "tele0" anchored = 1 density = 0 diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm index 1f5af8753e1..c7779dd5ca8 100644 --- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm +++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm @@ -18,7 +18,7 @@ /obj/item/weapon/anodevice name = "Anomaly power utilizer" - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "anodev" var/cooldown = 0 var/activated = 0 diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 36a75826f72..2831e5ccc1f 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -1,7 +1,7 @@ /obj/machinery/suspension_gen name = "suspension field generator" desc = "It has stubby legs bolted up against it's body for stabilising." - icon = 'xenoarchaeology.dmi' + icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "suspension2" density = 1 req_access = list(access_research) diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm index 60eb7ca5705..889e8332593 100644 --- a/code/modules/research/xenoarchaeology/tools/tools.dm +++ b/code/modules/research/xenoarchaeology/tools/tools.dm @@ -5,7 +5,7 @@ /obj/item/device/gps name = "relay positioning device" desc = "Triangulates the approximate co-ordinates using a nearby satellite network." - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "locator" item_state = "locator" w_class = 2 diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index e060fc44ae7..d00b945c607 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -16,7 +16,7 @@ /obj/item/device/core_sampler name = "core sampler" desc = "Used to extract geological core samples." - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "sampler0" item_state = "screwdriver_brown" w_class = 1.0 diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 1ad3d233b83..23a4e2ca174 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -6,7 +6,7 @@ /obj/item/device/depth_scanner name = "depth analysis scanner" desc = "Used to check spatial depth and density of rock outcroppings." - icon = 'pda.dmi' + icon = 'icons/obj/pda.dmi' icon_state = "crap" item_state = "analyzer" w_class = 1.0 diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index ea86c6de9d5..64f6caec5be 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -5,7 +5,7 @@ /obj/item/device/beacon_locator name = "locater device" desc = "Used to scan and locate signals on a particular frequency according ." - icon = 'device.dmi' + icon = 'icons/obj/device.dmi' icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull item_state = "electronic" var/frequency = 1459 diff --git a/code/modules/virus2/analyser.dm b/code/modules/virus2/analyser.dm index 21471a8379b..50673d403cb 100644 --- a/code/modules/virus2/analyser.dm +++ b/code/modules/virus2/analyser.dm @@ -1,6 +1,6 @@ /obj/machinery/disease2/diseaseanalyser name = "Disease Analyser" - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" anchored = 1 density = 1 diff --git a/code/modules/virus2/biohazard destroyer.dm b/code/modules/virus2/biohazard destroyer.dm index 3e5f16df59f..abd1803de86 100644 --- a/code/modules/virus2/biohazard destroyer.dm +++ b/code/modules/virus2/biohazard destroyer.dm @@ -1,6 +1,6 @@ /obj/machinery/disease2/biodestroyer name = "Biohazard destroyer" - icon = 'disposal.dmi' + icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposalbio" var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers) density = 1 @@ -11,7 +11,7 @@ if(I.type in typesof(path)) user.drop_item() del(I) - overlays += image('disposal.dmi', "dispover-handle") + overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle") return user.drop_item() I.loc = src.loc diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index c39f1d02dfc..7a414e388ec 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/diseasesplicer name = "Disease Splicer" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "crew" var/datum/disease2/effectholder/memorybank = null diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 5d2771b2950..74d5470ec1a 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -2,7 +2,7 @@ name = "Pathogenic incubator" density = 1 anchored = 1 - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "incubator" var/obj/item/weapon/virusdish/dish var/obj/item/weapon/reagent_containers/glass/beaker = null diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index 667ab67e999..53b47b95e1c 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -2,7 +2,7 @@ name = "Pathogenic Isolator" density = 1 anchored = 1 - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "isolator" var/datum/disease2/disease/virus2 = null var/isolating = 0 diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 25674ea2b6e..27b01513ea5 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -28,7 +28,7 @@ /obj/item/weapon/virusdish name = "Virus containment/growth dish" - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "implantcase-b" var/datum/disease2/disease/virus2 = null var/growth = 0 @@ -69,7 +69,7 @@ /obj/item/weapon/diseasedisk name = "Blank GNA disk" - icon = 'cloning.dmi' + icon = 'icons/obj/cloning.dmi' icon_state = "datadisk0" var/datum/disease2/effectholder/effect = null var/stage = 1 diff --git a/code/setup.dm b/code/setup.dm index 7395595cee5..e2f50a48f41 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -722,4 +722,4 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse //Language flags. #define WHITELISTED 1 // Language is available if the speaker is whitelisted. -#define RESTRICTED 2 // Language can only be accquired by spawning or an admin. +#define RESTRICTED 2 // Language can only be accquired by spawning or an admin. From 497b050488385489e07026fa3a2d9f63c602ff99 Mon Sep 17 00:00:00 2001 From: ZipIce Date: Sun, 1 Sep 2013 23:42:35 -0700 Subject: [PATCH 14/18] Update disease.dm This will remove some run-time errors, allowing disease to work when the mob has no reagents (new players and simple animals). --- code/datums/disease.dm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/code/datums/disease.dm b/code/datums/disease.dm index 68c1bf105d3..93aa14f19b3 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -91,10 +91,13 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease for(var/C_list in cure_list) if(istype(C_list, /list)) for(var/C_id in cure_id) - if(!affected_mob.reagents.has_reagent(C_id)) + if(affected_mob.reagents != null) result = 0 - else if(!affected_mob.reagents.has_reagent(C_list)) - result = 0 + else if(!affected_mob.reagents.has_reagent(C_id)) + result = 0 + else if(affected_mob.reagents != null) + if(!affected_mob.reagents.has_reagent(C_list)) + result = 0 return result @@ -123,10 +126,11 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease source = affected_mob else //no source and no mob affected. Rogue disease. Break return - - if(affected_mob) - if(affected_mob.reagents.has_reagent("spaceacillin")) - return // Don't spread if we have spaceacillin in our system. + + if(affected_mob.reagents != null) + if(affected_mob) + if(affected_mob.reagents.has_reagent("spaceacillin")) + return // Don't spread if we have spaceacillin in our system. var/check_range = airborne_range//defaults to airborne - range 2 From 72d158143ba0d541881fd1fd28f3d5a027450795 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Mon, 2 Sep 2013 21:50:58 +0100 Subject: [PATCH 15/18] Previous commit apparently got swallowed by the git monster. Turns off auto FILE_DIR in .dme, fixes compile error. Signed-off-by: Mloc-Argent --- baystation12.dme | 57 ++---------------------- code/modules/customitems/item_defines.dm | 2 +- 2 files changed, 5 insertions(+), 54 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 106f13e2db4..9345162cbff 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -5,55 +5,6 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/TriDimension" -#define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" -#define FILE_DIR "code/WorkInProgress/Susan" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/48x48" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/human_races" -#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/flora" -#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/vending_icons" -#define FILE_DIR "icons/xenoarch_icons" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/effects/turret" -#define FILE_DIR "sound/effects/wind" -#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/music" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/Serithi" -#define FILE_DIR "sound/vox" -#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG @@ -786,10 +737,10 @@ #include "code\modules\customitems\item_defines.dm" #include "code\modules\customitems\item_spawning.dm" #include "code\modules\destilery\main.dm" -#include "code\modules\DetectiveWork\detective_work.dm" -#include "code\modules\DetectiveWork\evidence.dm" -#include "code\modules\DetectiveWork\footprints_and_rag.dm" -#include "code\modules\DetectiveWork\scanner.dm" +#include "code\modules\detectivework\detective_work.dm" +#include "code\modules\detectivework\evidence.dm" +#include "code\modules\detectivework\footprints_and_rag.dm" +#include "code\modules\detectivework\scanner.dm" #include "code\modules\events\alien_infestation.dm" #include "code\modules\events\blob.dm" #include "code\modules\events\brand_intelligence.dm" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 78d30945154..c9bcfa7281e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -616,7 +616,7 @@ /obj/item/clothing/suit/fluff/oldscarf //Writerer2: Javaria Zara name = "old scarf" desc = "An old looking scarf, it seems to be fairly worn." - icon = 'clothing/suits.dmi' + icon = 'icons/obj/clothing/suits.dmi' icon_state = "mantle-unathi" item_state = "mantle-unathi" body_parts_covered = UPPER_TORSO From 2d97372967abf3811583d86c71eb4e427a21cbd6 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Mon, 2 Sep 2013 21:54:51 +0100 Subject: [PATCH 16/18] That apparently didn't work so I have to put it in a .int. Signed-off-by: Mloc-Argent --- baystation12.int | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 baystation12.int diff --git a/baystation12.int b/baystation12.int new file mode 100644 index 00000000000..29f9e64646a --- /dev/null +++ b/baystation12.int @@ -0,0 +1,5 @@ +// BEGIN_INTERNALS +/* +AUTO_FILE_DIR: OFF +*/ +// END_INTERNALS From 94fc06d0dff0f1ea76973757e9a0951297654f1e Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 3 Sep 2013 00:41:46 -0700 Subject: [PATCH 17/18] Temporary fix for ZAS processing twice per time interval. --- code/controllers/master_controller.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 22a905a2070..be684e32010 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -125,11 +125,6 @@ datum/controller/game_controller/proc/process() if(!air_processing_killed) timer = world.timeofday last_thing_processed = air_master.type - air_master.tick() - air_cost = (world.timeofday - timer) / 10 // this might make atmos slower - // 1. atmos won't process if the game is generally lagged out(no deadlocks) - // 2. if the server frequently crashes during atmos processing we will knowif(!kill_air) - //src.set_debug_state("Air Master") air_master.current_cycle++ if(!air_master.tick()) //Runtimed. From 081356f21b3f9e2e9ffd9e4f5328adeec7b2c94d Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 3 Sep 2013 20:58:26 -0700 Subject: [PATCH 18/18] Fixes longstanding connection bug. --- code/ZAS/Connection.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/ZAS/Connection.dm b/code/ZAS/Connection.dm index 8a919d50435..b26217eeb6c 100644 --- a/code/ZAS/Connection.dm +++ b/code/ZAS/Connection.dm @@ -104,8 +104,7 @@ Indirect connections will not merge the two zones after they reach equilibrium. //Disconnect zones while handling unusual conditions. // e.g. loss of a zone on a turf - if(A && A.zone && B && B.zone) - DisconnectZones(A.zone, B.zone) + DisconnectZones(zone_A, zone_B) //Finally, preform actual deletion. . = ..() @@ -400,4 +399,4 @@ Indirect connections will not merge the two zones after they reach equilibrium. #undef CONNECTION_DIRECT #undef CONNECTION_INDIRECT -#undef CONNECTION_CLOSED \ No newline at end of file +#undef CONNECTION_CLOSED