From 52161061922b1d8b5ba0246e55352ad23a78e8a6 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Wed, 1 May 2019 21:35:56 +0200 Subject: [PATCH 01/30] Uplink kit rebalance --- .../items/weapons/storage/uplink_kits.dm | 203 +++++++++--------- .../projectiles/guns/projectile/sniper.dm | 8 - 2 files changed, 102 insertions(+), 109 deletions(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 56db11ad058..f052365963f 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -1,112 +1,113 @@ -/obj/item/storage/box/syndicate/ - New() - ..() - switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "gadgets" = 1, "professional" = 1))) - if("bloodyspai") // 28TC - new /obj/item/twohanded/garrote(src) - new /obj/item/pinpointer/advpinpointer(src) - new /obj/item/clothing/mask/chameleon(src) - new /obj/item/clothing/under/chameleon(src) - new /obj/item/card/id/syndicate(src) - new /obj/item/flashlight/emp(src) - new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) - new /obj/item/clothing/glasses/hud/security/chameleon(src) - new /obj/item/camera_bug(src) - return +/obj/item/storage/box/syndicate/New() + ..() + switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "professional" = 1))) + if("bloodyspai") // 35TC + one 0TC + new /obj/item/clothing/under/chameleon(src) // 2TC + new /obj/item/clothing/mask/chameleon(src) // 0TC + new /obj/item/card/id/syndicate(src) // 2TC + new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC + new /obj/item/camera_bug(src) // 1TC + new /obj/item/multitool/ai_detect(src) // 1TC + new /obj/item/encryptionkey/syndicate(src) // 2TC + new /obj/item/twohanded/garrote(src) // 10TC + new /obj/item/pinpointer/advpinpointer(src) // 4TC + new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) // 2TC + new /obj/item/flashlight/emp(src) // 2TC + new /obj/item/clothing/glasses/hud/security/chameleon(src) // 2TC + new /obj/item/chameleon(src) // 8TC + return - if("thief") // 30TC - new /obj/item/gun/energy/kinetic_accelerator/crossbow(src) - new /obj/item/chameleon(src) - new /obj/item/clothing/gloves/color/black/thief(src) - new /obj/item/card/id/syndicate(src) - new /obj/item/clothing/shoes/chameleon/noslip(src) - new /obj/item/storage/box/syndie_kit/safecracking(src) - return + if("thief") // 44TC + new /obj/item/gun/energy/kinetic_accelerator/crossbow(src) // 12TC + new /obj/item/pen/sleepy(src) // 8TC + new /obj/item/chameleon(src) // 8TC + new /obj/item/clothing/glasses/thermal/syndi(src) // 6TC + new /obj/item/clothing/gloves/color/black/thief(src) // 6TC + new /obj/item/card/id/syndicate(src) // 2TC + new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC + return - if("bond") // 29TC + Healing Cocktail + armored suit jacket - new /obj/item/gun/projectile/automatic/pistol(src) - new /obj/item/suppressor(src) - new /obj/item/ammo_box/magazine/m10mm/hp(src) - new /obj/item/ammo_box/magazine/m10mm/ap(src) - new /obj/item/encryptionkey/syndicate(src) - new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(src) // This drink heals now - new /obj/item/card/id/syndicate(src) - new /obj/item/dnascrambler(src) - new /obj/item/storage/box/syndie_kit/emp(src) - new /obj/item/CQC_manual(src) - new /obj/item/clothing/under/suit_jacket/really_black(src) - new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) - return + if("bond") // 33TC + three 0TC + new /obj/item/gun/projectile/automatic/pistol(src) // 4TC + new /obj/item/suppressor(src) // 1TC + new /obj/item/ammo_box/magazine/m10mm/hp(src) // 3TC + new /obj/item/ammo_box/magazine/m10mm/ap(src) // 2TC + new /obj/item/clothing/under/suit_jacket/really_black(src) // 0TC + new /obj/item/card/id/syndicate(src) // 2TC + new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) // 0TC + new /obj/item/encryptionkey/syndicate(src) // 2TC + new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(src) // 0TC + new /obj/item/dnascrambler(src) // 4TC + new /obj/item/storage/box/syndie_kit/emp(src) // 2TC + new /obj/item/CQC_manual(src) // 13TC + return - if("sabotage") // 31TC + RCD + Insuls - new /obj/item/powersink(src) - new /obj/item/grenade/syndieminibomb(src) - new /obj/item/card/emag(src) - new /obj/item/grenade/clusterbuster/n2o(src) - new /obj/item/clothing/gloves/color/yellow(src) - new /obj/item/rcd/preloaded(src) - new /obj/item/storage/box/syndie_kit/space(src) - return + if("sabotage") // 45TC + three 0TC + new /obj/item/grenade/plastic/c4(src) // 1TC + new /obj/item/grenade/plastic/c4(src) // 1TC + new /obj/item/camera_bug(src) // 1TC + new /obj/item/powersink(src) // 10TC + new /obj/item/cartridge/syndicate(src) // 6TC + new /obj/item/rcd/preloaded(src) // 0TC + new /obj/item/card/emag(src) // 6TC + new /obj/item/clothing/gloves/color/yellow(src) // 0TC + new /obj/item/grenade/syndieminibomb(src) // 6TC + new /obj/item/grenade/clusterbuster/n2o(src) // 0TC + new /obj/item/storage/box/syndie_kit/space(src) // 4TC + return - if("payday") // 31TC + armored suit jacket - new /obj/item/gun/projectile/revolver(src) - new /obj/item/ammo_box/a357(src) - new /obj/item/ammo_box/a357(src) - new /obj/item/card/emag(src) - new /obj/item/grenade/plastic/c4(src) - new /obj/item/card/id/syndicate(src) - new /obj/item/clothing/under/suit_jacket/really_black(src) - new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) - new /obj/item/clothing/gloves/color/latex/nitrile(src) - new /obj/item/clothing/mask/gas/clown_hat(src) - new /obj/item/thermal_drill(src) - return + if("payday") // 31TC + four 0TC + new /obj/item/gun/projectile/revolver(src) // 13TC + new /obj/item/ammo_box/a357(src) // 3TC + new /obj/item/ammo_box/a357(src) // 3TC + new /obj/item/card/emag(src) // 6TC + new /obj/item/grenade/plastic/c4(src) // 1TC + new /obj/item/card/id/syndicate(src) // 2TC + new /obj/item/clothing/under/suit_jacket/really_black(src) //0TC + new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) //0TC + new /obj/item/clothing/gloves/color/latex/nitrile(src) //0 TC + new /obj/item/clothing/mask/gas/clown_hat(src) // 0TC + new /obj/item/thermal_drill(src) // 3TC + return - if("implant") // 35TC - new /obj/item/implanter/uplink(src) - new /obj/item/implanter/adrenalin(src) - new /obj/item/implanter/storage(src) - new /obj/item/implanter/freedom(src) - return + if("implant") // 37TC + ten free TC + new /obj/item/implanter/freedom(src) // 5TC + new /obj/item/implanter/uplink(src) // 14TC (ten free TC) + new /obj/item/implanter/emp(src) // 0TC + new /obj/item/implanter/adrenalin(src) // 8TC + new /obj/item/implanter/explosive(src) // 2TC + new /obj/item/implanter/storage(src) // 8TC + return - if("hacker") // 22TC + Ion law uploader - new /obj/item/aiModule/syndicate(src) - new /obj/item/encryptionkey/binary(src) - new /obj/item/encryptionkey/syndicate(src) - new /obj/item/aiModule/toyAI(src) - new /obj/item/card/emag(src) - return + if("hacker") // 30TC + one 0TC + new /obj/item/aiModule/syndicate(src) // 12TC + new /obj/item/card/emag(src) // 6TC + new /obj/item/encryptionkey/syndicate(src) // 2TC + new /obj/item/encryptionkey/binary(src) // 5TC + new /obj/item/aiModule/toyAI(src) // 0TC + new /obj/item/multitool/ai_detect(src) // 1TC + new /obj/item/storage/box/syndie_kit/c4 // 4TC + return - if("darklord") // 23TC + TK implant - new /obj/item/melee/energy/sword/saber/red(src) - new /obj/item/melee/energy/sword/saber/red(src) - new /obj/item/dnainjector/telemut/darkbundle(src) - new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) - new /obj/item/card/id/syndicate(src) - new /obj/item/clothing/shoes/chameleon/noslip(src) - new /obj/item/clothing/mask/chameleon(src) - return + if("darklord") // 22TC + two 0TC + new /obj/item/melee/energy/sword/saber/red(src) // 8TC + new /obj/item/melee/energy/sword/saber/red(src) // 8TC + new /obj/item/dnainjector/telemut/darkbundle(src) // 0TC + new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) // 0TC + new /obj/item/card/id/syndicate(src) // 2TC + new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC + new /obj/item/clothing/mask/chameleon(src) // 2TC + return - if("gadgets") // 30TC - new /obj/item/clothing/gloves/color/yellow/power(src) - new /obj/item/pen/sleepy(src) - new /obj/item/clothing/shoes/chameleon/noslip(src) - new /obj/item/clothing/glasses/thermal/syndi(src) - new /obj/item/flashlight/emp(src) - new /obj/item/stamp/chameleon(src) - new /obj/item/multitool/ai_detect(src) - return - - if("professional") // 29TC + armored suit jacket + insulated combat gloves - new /obj/item/gun/projectile/automatic/sniper_rifle/soporific(src) // Unique version that starts with soporific rounds loaded and cannot be suppressed - new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) - new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) - new /obj/item/pen/edagger(src) - new /obj/item/clothing/glasses/thermal/syndi/sunglasses(src) - new /obj/item/clothing/under/suit_jacket/really_black(src) - new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) - new /obj/item/clothing/gloves/combat(src) - return + if("professional") // 29 TC + two 0TC + new /obj/item/gun/projectile/automatic/sniper_rifle(src) // 16TC + new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5TC + new /obj/item/clothing/glasses/thermal/syndi/sunglasses(src) // 6TC + new /obj/item/clothing/gloves/combat(src) // 0 TC + new /obj/item/clothing/under/suit_jacket/really_black(src) // 0 TC + new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) // 0TC + new /obj/item/pen/edagger(src) // 2TC + return /obj/item/storage/box/syndie_kit name = "Box" diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index cbffd8ecf8a..1be05bf03ef 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -31,14 +31,6 @@ desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face" origin_tech = "combat=7;syndicate=6" -/obj/item/gun/projectile/automatic/sniper_rifle/soporific - name = "Soporific sniper rifle" - desc = "A sniper rifle that's primarily used to fire non-lethal soporific rounds." - origin_tech = "combat=7;syndicate=6" - mag_type = /obj/item/ammo_box/magazine/sniper_rounds/soporific - can_unsuppress = 0 - can_suppress = 0 - /obj/item/gun/projectile/automatic/sniper_rifle/compact //holds very little ammo, lacks zooming, and bullets are primarily damage dealers, but the gun lacks the downsides of the full size rifle name = "compact sniper rifle" desc = "a compact, unscoped version of the standard issue syndicate sniper rifle. Still capable of sending people crying." From b3d7681a4a67cec041ac2ab579c7548c5528bdb0 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Wed, 1 May 2019 22:24:51 +0200 Subject: [PATCH 02/30] Discord feedback on bundles --- .../items/weapons/storage/uplink_kits.dm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index f052365963f..93b6daf3fec 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -17,14 +17,15 @@ new /obj/item/chameleon(src) // 8TC return - if("thief") // 44TC + if("thief") // 40TC new /obj/item/gun/energy/kinetic_accelerator/crossbow(src) // 12TC - new /obj/item/pen/sleepy(src) // 8TC new /obj/item/chameleon(src) // 8TC new /obj/item/clothing/glasses/thermal/syndi(src) // 6TC new /obj/item/clothing/gloves/color/black/thief(src) // 6TC new /obj/item/card/id/syndicate(src) // 2TC new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC + new /obj/item/storage/backpack/satchel_flat(src) // 2TC + new /obj/item/encryptionkey/syndicate(src) // 2TC return if("bond") // 33TC + three 0TC @@ -42,7 +43,7 @@ new /obj/item/CQC_manual(src) // 13TC return - if("sabotage") // 45TC + three 0TC + if("sabotage") // 47TC + three 0TC new /obj/item/grenade/plastic/c4(src) // 1TC new /obj/item/grenade/plastic/c4(src) // 1TC new /obj/item/camera_bug(src) // 1TC @@ -54,9 +55,10 @@ new /obj/item/grenade/syndieminibomb(src) // 6TC new /obj/item/grenade/clusterbuster/n2o(src) // 0TC new /obj/item/storage/box/syndie_kit/space(src) // 4TC + new /obj/item/encryptionkey/syndicate(src) // 2TC return - if("payday") // 31TC + four 0TC + if("payday") // 33TC + four 0TC new /obj/item/gun/projectile/revolver(src) // 13TC new /obj/item/ammo_box/a357(src) // 3TC new /obj/item/ammo_box/a357(src) // 3TC @@ -68,15 +70,17 @@ new /obj/item/clothing/gloves/color/latex/nitrile(src) //0 TC new /obj/item/clothing/mask/gas/clown_hat(src) // 0TC new /obj/item/thermal_drill(src) // 3TC + new /obj/item/encryptionkey/syndicate(src) // 2TC return - if("implant") // 37TC + ten free TC + if("implant") // 39TC + ten free TC new /obj/item/implanter/freedom(src) // 5TC new /obj/item/implanter/uplink(src) // 14TC (ten free TC) new /obj/item/implanter/emp(src) // 0TC new /obj/item/implanter/adrenalin(src) // 8TC new /obj/item/implanter/explosive(src) // 2TC new /obj/item/implanter/storage(src) // 8TC + new /obj/item/encryptionkey/syndicate(src) // 2TC return if("hacker") // 30TC + one 0TC @@ -97,16 +101,19 @@ new /obj/item/card/id/syndicate(src) // 2TC new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC new /obj/item/clothing/mask/chameleon(src) // 2TC + new /obj/item/encryptionkey/syndicate(src) // 2TC return - if("professional") // 29 TC + two 0TC + if("professional") // 32 TC + two 0TC new /obj/item/gun/projectile/automatic/sniper_rifle(src) // 16TC new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5TC + new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) // 3TC new /obj/item/clothing/glasses/thermal/syndi/sunglasses(src) // 6TC new /obj/item/clothing/gloves/combat(src) // 0 TC new /obj/item/clothing/under/suit_jacket/really_black(src) // 0 TC new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) // 0TC new /obj/item/pen/edagger(src) // 2TC + new /obj/item/encryptionkey/syndicate(src) // 2TC return /obj/item/storage/box/syndie_kit From eac4f841ce9e27b17213fc25884627fccec7b369 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 2 May 2019 01:39:11 +0200 Subject: [PATCH 03/30] Switch to penetrator/sopo rounds only --- .../items/weapons/storage/uplink_kits.dm | 2 +- .../projectiles/guns/projectile/sniper.dm | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 93b6daf3fec..5d31cc3f59b 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -105,7 +105,7 @@ return if("professional") // 32 TC + two 0TC - new /obj/item/gun/projectile/automatic/sniper_rifle(src) // 16TC + new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator(src) // 16TC new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5TC new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) // 3TC new /obj/item/clothing/glasses/thermal/syndi/sunglasses(src) // 6TC diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 1be05bf03ef..e030c9afb2a 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/automatic/sniper_rifle name = "sniper rifle" - desc = "the kind of gun that will leave you crying for mummy before you even realise your leg's missing" + desc = "The kind of gun that will leave you crying for mummy before you even realise your leg's missing." icon_state = "sniper" item_state = "sniper" recoil = 2 @@ -20,17 +20,27 @@ slot_flags = SLOT_BACK actions_types = list() +/obj/item/gun/projectile/automatic/sniper_rifle/syndicate + name = "syndicate sniper rifle" + desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face." + origin_tech = "combat=7;syndicate=6" + +/obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator + name = "syndicate penetrator sniper rifle" + +/obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator/Initialize(mapload) + . = ..() + desc += " It comes loaded with a penetrator magazine, but can use different magazines." + + QDEL_NULL(magazine) + magazine = new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) + /obj/item/gun/projectile/automatic/sniper_rifle/update_icon() if(magazine) icon_state = "sniper-mag" else icon_state = "sniper" -/obj/item/gun/projectile/automatic/sniper_rifle/syndicate - name = "syndicate sniper rifle" - desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face" - origin_tech = "combat=7;syndicate=6" - /obj/item/gun/projectile/automatic/sniper_rifle/compact //holds very little ammo, lacks zooming, and bullets are primarily damage dealers, but the gun lacks the downsides of the full size rifle name = "compact sniper rifle" desc = "a compact, unscoped version of the standard issue syndicate sniper rifle. Still capable of sending people crying." From 33dc5697b90bb77531072eb30db891d9fd5e5a3e Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 2 May 2019 19:20:14 -0700 Subject: [PATCH 04/30] fixes throw_at runtime in vendors --- code/game/atoms_movable.dm | 2 +- code/game/machinery/vending.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 2d3f01a139d..6005db646a6 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -299,7 +299,7 @@ pulledby.stop_pulling() // They are moving! Wouldn't it be cool if we calculated their momentum and added it to the throw? - if(thrower && thrower.last_move && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag * 2) + if(thrower && istype(thrower) && thrower.last_move && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag * 2) var/user_momentum = thrower.movement_delay() if(!user_momentum) // no movement_delay, this means they move once per byond tick, let's calculate from that instead user_momentum = world.tick_lag diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d0872fa8f93..f510cdbdd51 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -738,7 +738,7 @@ break if(!throw_item) return - throw_item.throw_at(target, 16, 3, src) + throw_item.throw_at(target, 16, 3) visible_message("[src] launches [throw_item.name] at [target.name]!") /* From 4480f28abbf5678dcb8bc62bc5170340f9f2e5e7 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 2 May 2019 21:13:22 -0700 Subject: [PATCH 05/30] revert atoms_movable update --- code/game/atoms_movable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 6005db646a6..2d3f01a139d 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -299,7 +299,7 @@ pulledby.stop_pulling() // They are moving! Wouldn't it be cool if we calculated their momentum and added it to the throw? - if(thrower && istype(thrower) && thrower.last_move && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag * 2) + if(thrower && thrower.last_move && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag * 2) var/user_momentum = thrower.movement_delay() if(!user_momentum) // no movement_delay, this means they move once per byond tick, let's calculate from that instead user_momentum = world.tick_lag From a015ab755f9ce052b98c2a6c876846b18408f953 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 5 May 2019 13:14:00 +0200 Subject: [PATCH 06/30] Cuffs can't be used when you have antidrop on --- code/game/objects/items/weapons/handcuffs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 6fa0c875333..28e73f29317 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -24,6 +24,10 @@ if(!istype(C)) return + if(flags & NODROP) + to_chat(user, "[src] is stuck to your hand!") + return + if((CLUMSY in user.mutations) && prob(50) && (!ignoresClumsy)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user, user) From 93b45d91c58756cf1626328a8da423b3f7c2ec4d Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sun, 5 May 2019 20:14:34 +0200 Subject: [PATCH 07/30] Species chameleon fixes --- code/game/objects/items.dm | 27 +++++++++- code/modules/clothing/under/chameleon.dm | 64 ++++++++++++++++++++---- 2 files changed, 80 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6d91b4c8778..37e286900f4 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -605,4 +605,29 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d if(!ismob(loc)) return var/mob/owner = loc - owner.regenerate_icons() + var/flags = slot_flags + if(flags & SLOT_OCLOTHING) + owner.update_inv_wear_suit() + if(flags & SLOT_ICLOTHING) + owner.update_inv_w_uniform() + if(flags & SLOT_GLOVES) + owner.update_inv_gloves() + if(flags & SLOT_EYES) + owner.update_inv_glasses() + if(flags & SLOT_EARS) + owner.update_inv_ears() + if(flags & SLOT_MASK) + owner.update_inv_wear_mask() + if(flags & SLOT_HEAD) + owner.update_inv_head() + if(flags & SLOT_FEET) + owner.update_inv_shoes() + if(flags & SLOT_ID) + owner.update_inv_wear_id() + if(flags & SLOT_BELT) + owner.update_inv_belt() + if(flags & SLOT_BACK) + owner.update_inv_back() + if(flags & SLOT_PDA) + owner.update_inv_wear_pda() + diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index b08a1ce72c9..f08ff54ee75 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -139,18 +139,30 @@ UpdateButtonIcon() /datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item) - target.name = initial(picked_item.name) - target.desc = initial(picked_item.desc) - target.icon_state = initial(picked_item.icon_state) + // Species-related variables are lists, which can not be retrieved using initial(). As such, we need to instantiate the picked item. + var/obj/item/P = new picked_item(null) + + target.name = P.name + target.desc = P.desc + target.icon_state = P.icon_state + if(isitem(target)) var/obj/item/I = target - I.item_state = initial(picked_item.item_state) - I.item_color = initial(picked_item.item_color) - if(istype(I, /obj/item/clothing) && istype(initial(picked_item), /obj/item/clothing)) + + I.item_state = P.item_state + I.item_color = P.item_color + + I.icon_override = P.icon_override + I.species_fit = P.species_fit + I.sprite_sheets = P.sprite_sheets + + if(istype(I, /obj/item/clothing) && istype(P, /obj/item/clothing)) var/obj/item/clothing/CL = I - var/obj/item/clothing/PCL = picked_item - CL.flags_cover = initial(PCL.flags_cover) - target.icon = initial(picked_item.icon) + var/obj/item/clothing/PCL = P + CL.flags_cover = PCL.flags_cover + + target.icon = P.icon + qdel(P) /datum/action/item_action/chameleon/change/Trigger() if(!IsAvailable()) @@ -174,7 +186,6 @@ random_look(owner) /obj/item/clothing/under/chameleon -//starts off as black name = "black jumpsuit" icon_state = "black" item_state = "bl_suit" @@ -212,6 +223,11 @@ resistance_flags = NONE armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/clothing/suit/chameleon/Initialize() @@ -238,6 +254,13 @@ resistance_flags = NONE armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/eyes.dmi', + "Drask" = 'icons/mob/species/drask/eyes.dmi', + "Grey" = 'icons/mob/species/grey/eyes.dmi' + ) + var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/clothing/glasses/chameleon/Initialize() @@ -292,6 +315,11 @@ resistance_flags = NONE armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/head.dmi' + ) + var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/clothing/head/chameleon/Initialize() @@ -323,6 +351,16 @@ permeability_coefficient = 0.01 flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/species/drask/mask.dmi', + "Grey" = 'icons/mob/species/grey/mask.dmi' + ) + var/obj/item/voice_changer/voice_changer var/datum/action/item_action/chameleon/change/chameleon_action @@ -386,6 +424,12 @@ /obj/item/storage/backpack/chameleon name = "backpack" + + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/back.dmi' + ) + var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/storage/backpack/chameleon/Initialize() From 90f71f164a7bbff423873d4fd7aaa205047f9db6 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sun, 5 May 2019 20:37:53 +0200 Subject: [PATCH 08/30] Remove unused species_fit and move chameleon file --- .../gamemodes/changeling/powers/mutations.dm | 1 - .../miniantags/abduction/abduction_gear.dm | 1 - code/game/objects/items.dm | 1 - code/game/objects/items/weapons/cigs.dm | 1 - code/game/objects/items/weapons/defib.dm | 1 - .../objects/items/weapons/storage/backpack.dm | 1 - .../modules/clothing/{under => }/chameleon.dm | 1036 ++++++++--------- code/modules/clothing/clothing.dm | 7 +- code/modules/clothing/glasses/glasses.dm | 32 +- code/modules/clothing/glasses/hud.dm | 14 +- code/modules/clothing/head/collectable.dm | 4 +- code/modules/clothing/head/hardhat.dm | 4 +- code/modules/clothing/head/helmet.dm | 4 +- code/modules/clothing/head/misc.dm | 14 +- code/modules/clothing/head/misc_special.dm | 10 +- code/modules/clothing/head/soft_caps.dm | 2 +- code/modules/clothing/masks/boxing.dm | 4 +- code/modules/clothing/masks/breath.dm | 3 +- code/modules/clothing/masks/gasmask.dm | 2 +- code/modules/clothing/masks/miscellaneous.dm | 14 +- code/modules/clothing/patreon/glasses.dm | 2 +- code/modules/clothing/patreon/hats.dm | 8 +- code/modules/clothing/spacesuits/ert.dm | 15 +- code/modules/clothing/spacesuits/hardsuit.dm | 2 +- .../clothing/spacesuits/miscellaneous.dm | 21 +- code/modules/clothing/suits/alien.dm | 1 - code/modules/clothing/suits/armor.dm | 5 +- code/modules/clothing/suits/bio.dm | 6 +- code/modules/clothing/suits/jobs.dm | 31 +- code/modules/clothing/suits/labcoat.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 34 +- code/modules/clothing/suits/utility.dm | 12 +- .../clothing/under/accessories/accessory.dm | 22 +- .../clothing/under/accessories/storage.dm | 2 +- code/modules/clothing/under/color.dm | 2 +- code/modules/clothing/under/jobs/security.dm | 2 +- code/modules/customitems/item_defines.dm | 16 +- .../mob/living/carbon/human/update_icons.dm | 2 +- code/modules/ninja/suit/mask.dm | 2 +- code/modules/vr/vr_goggles.dm | 2 +- paradise.dme | 2 +- 41 files changed, 651 insertions(+), 696 deletions(-) rename code/modules/clothing/{under => }/chameleon.dm (95%) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 4b5560fe333..7624508ee63 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -477,7 +477,6 @@ flags_inv = HIDEJUMPSUIT cold_protection = 0 heat_protection = 0 - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/changeling/New() diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 827eefb569d..f6bed7b539f 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -23,7 +23,6 @@ var/datum/icon_snapshot/disguise var/stealth_armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) var/combat_armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 50, rad = 50) - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/abductor/vest/proc/toggle_nodrop() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 37e286900f4..47b543a047d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -89,7 +89,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d var/list/sprite_sheets = null var/icon_override = null //Used to override hardcoded clothing dmis in human clothing proc. var/sprite_sheets_obj = null //Used to override hardcoded clothing inventory object dmis in human clothing proc. - var/list/species_fit = null //This object has a different appearance when worn by these species var/trip_verb = TV_TRIP var/trip_chance = 0 diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index ce9f5d916a2..fa4b90e0e37 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -31,7 +31,6 @@ LIGHTERS ARE IN LIGHTERS.DM var/lastHolder = null var/smoketime = 300 var/chem_volume = 30 - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index ea70e29ef83..05f725fcf54 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -11,7 +11,6 @@ w_class = WEIGHT_CLASS_BULKY origin_tech = "biotech=4" actions_types = list(/datum/action/item_action/toggle_paddles) - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/back.dmi' ) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 56ae2864071..cd65ba0fcb7 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -17,7 +17,6 @@ storage_slots = 21 burn_state = FLAMMABLE burntime = 20 - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/back.dmi' ) diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/chameleon.dm similarity index 95% rename from code/modules/clothing/under/chameleon.dm rename to code/modules/clothing/chameleon.dm index f08ff54ee75..0a0a2e45abd 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -1,522 +1,516 @@ -#define EMP_RANDOMISE_TIME 300 - -/datum/action/chameleon_outfit - name = "Select Chameleon Outfit" - button_icon_state = "chameleon_outfit" - var/list/outfit_options //By default, this list is shared between all instances. It is not static because if it were, subtypes would not be able to have their own. If you ever want to edit it, copy it first. - -/datum/action/chameleon_outfit/New() - ..() - initialize_outfits() - -/datum/action/chameleon_outfit/proc/initialize_outfits() - var/static/list/standard_outfit_options - if(!standard_outfit_options) - standard_outfit_options = list() - for(var/path in subtypesof(/datum/outfit/job)) - var/datum/outfit/O = path - standard_outfit_options[initial(O.name)] = path - sortTim(standard_outfit_options, /proc/cmp_text_asc) - outfit_options = standard_outfit_options - -/datum/action/chameleon_outfit/Trigger() - return select_outfit(owner) - -/datum/action/chameleon_outfit/proc/select_outfit(mob/user) - if(!user || !IsAvailable()) - return FALSE - var/selected = input("Select outfit to change into", "Chameleon Outfit") as null|anything in outfit_options - if(!IsAvailable() || QDELETED(src) || QDELETED(user)) - return FALSE - var/outfit_type = outfit_options[selected] - if(!outfit_type) - return FALSE - var/datum/outfit/O = new outfit_type() - var/list/outfit_types = O.get_chameleon_disguise_info() - - for(var/V in user.chameleon_item_actions) - var/datum/action/item_action/chameleon/change/A = V - var/done = FALSE - for(var/T in outfit_types) - for(var/name in A.chameleon_list) - if(A.chameleon_list[name] == T) - A.update_look(user, T) - outfit_types -= T - done = TRUE - break - if(done) - break - //hardsuit helmets/suit hoods - if(ispath(O.suit, /obj/item/clothing/suit/hooded) && ishuman(user)) - var/mob/living/carbon/human/H = user - //make sure they are actually wearing the suit, not just holding it, and that they have a chameleon hat - if(istype(H.wear_suit, /obj/item/clothing/suit/chameleon) && istype(H.head, /obj/item/clothing/head/chameleon)) - var/helmet_type - var/obj/item/clothing/suit/hooded/hooded = O.suit - helmet_type = initial(hooded.hoodtype) - - if(helmet_type) - var/obj/item/clothing/head/chameleon/hat = H.head - hat.chameleon_action.update_look(user, helmet_type) - qdel(O) - return TRUE - - -/datum/action/item_action/chameleon/change - name = "Chameleon Change" - var/list/chameleon_blacklist = list() //This is a typecache - var/list/chameleon_list = list() - var/chameleon_type = null - var/chameleon_name = "Item" - - var/emp_timer - -/datum/action/item_action/chameleon/change/Grant(mob/M) - if(M && (owner != M)) - if(!M.chameleon_item_actions) - M.chameleon_item_actions = list(src) - var/datum/action/chameleon_outfit/O = new /datum/action/chameleon_outfit() - O.Grant(M) - else - M.chameleon_item_actions |= src - ..() - -/datum/action/item_action/chameleon/change/Remove(mob/M) - if(M && (M == owner)) - LAZYREMOVE(M.chameleon_item_actions, src) - if(!LAZYLEN(M.chameleon_item_actions)) - var/datum/action/chameleon_outfit/O = locate(/datum/action/chameleon_outfit) in M.actions - qdel(O) - ..() - -/datum/action/item_action/chameleon/change/proc/initialize_disguises() - if(button) - button.name = "Change [chameleon_name] Appearance" - - chameleon_blacklist |= typecacheof(target.type) - for(var/V in typesof(chameleon_type)) - if(ispath(V) && ispath(V, /obj/item)) - var/obj/item/I = V - if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT) || !initial(I.icon_state)) - continue - var/chameleon_item_name = "[initial(I.name)] ([initial(I.icon_state)])" - chameleon_list[chameleon_item_name] = I - -/datum/action/item_action/chameleon/change/proc/select_look(mob/user) - var/obj/item/picked_item - var/picked_name - picked_name = input("Select [chameleon_name] to change into", "Chameleon [chameleon_name]", picked_name) as null|anything in chameleon_list - if(!picked_name) - return - picked_item = chameleon_list[picked_name] - if(!picked_item) - return - update_look(user, picked_item) - -/datum/action/item_action/chameleon/change/proc/random_look(mob/user) - var/picked_name = pick(chameleon_list) - // If a user is provided, then this item is in use, and we - // need to update our icons and stuff - - if(user) - update_look(user, chameleon_list[picked_name]) - - // Otherwise, it's likely a random initialisation, so we - // don't have to worry - - else - update_item(chameleon_list[picked_name]) - -/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item) - if(isliving(user)) - var/mob/living/C = user - if(C.stat != CONSCIOUS) - return - - update_item(picked_item) - var/obj/item/thing = target - thing.update_slot_icon() - UpdateButtonIcon() - -/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item) - // Species-related variables are lists, which can not be retrieved using initial(). As such, we need to instantiate the picked item. - var/obj/item/P = new picked_item(null) - - target.name = P.name - target.desc = P.desc - target.icon_state = P.icon_state - - if(isitem(target)) - var/obj/item/I = target - - I.item_state = P.item_state - I.item_color = P.item_color - - I.icon_override = P.icon_override - I.species_fit = P.species_fit - I.sprite_sheets = P.sprite_sheets - - if(istype(I, /obj/item/clothing) && istype(P, /obj/item/clothing)) - var/obj/item/clothing/CL = I - var/obj/item/clothing/PCL = P - CL.flags_cover = PCL.flags_cover - - target.icon = P.icon - qdel(P) - -/datum/action/item_action/chameleon/change/Trigger() - if(!IsAvailable()) - return - - select_look(owner) - return 1 - -/datum/action/item_action/chameleon/change/proc/emp_randomise(var/amount = EMP_RANDOMISE_TIME) - START_PROCESSING(SSprocessing, src) - random_look(owner) - - var/new_value = world.time + amount - if(new_value > emp_timer) - emp_timer = new_value - -/datum/action/item_action/chameleon/change/process() - if(world.time > emp_timer) - STOP_PROCESSING(SSprocessing, src) - return - random_look(owner) - -/obj/item/clothing/under/chameleon - name = "black jumpsuit" - icon_state = "black" - item_state = "bl_suit" - item_color = "black" - desc = "It's a plain jumpsuit. It has a small dial on the wrist." - sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle?? - random_sensor = FALSE - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/under/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/under - chameleon_action.chameleon_name = "Jumpsuit" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/clothing/under/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/under/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/suit/chameleon - name = "armor" - desc = "A slim armored vest that protects against most types of damage." - icon_state = "armor" - item_state = "armor" - blood_overlay_type = "armor" - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/suit/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/suit - chameleon_action.chameleon_name = "Suit" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/suit/armor/abductor), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/clothing/suit/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/suit/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/glasses/chameleon - name = "Optical Meson Scanner" - desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." - icon_state = "meson" - item_state = "meson" - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/glasses/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/glasses - chameleon_action.chameleon_name = "Glasses" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - -/obj/item/clothing/glasses/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/glasses/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/gloves/chameleon - desc = "These gloves will protect the wearer from electric shock." - name = "insulated gloves" - icon_state = "yellow" - item_state = "ygloves" - - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/gloves/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/gloves - chameleon_action.chameleon_name = "Gloves" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/gloves, /obj/item/clothing/gloves/color), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/clothing/gloves/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/gloves/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/head/chameleon - name = "grey cap" - desc = "It's a baseball hat in a tasteful grey colour." - icon_state = "greysoft" - item_color = "grey" - - resistance_flags = NONE - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/head/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/head - chameleon_action.chameleon_name = "Hat" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - -/obj/item/clothing/head/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/head/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/mask/chameleon - name = "gas mask" - desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate - icon_state = "gas_alt" - item_state = "gas_alt" - resistance_flags = NONE - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - flags = AIRTIGHT | BLOCK_GAS_SMOKE_EFFECT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.01 - flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH - - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' - ) - - var/obj/item/voice_changer/voice_changer - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/mask/chameleon/Initialize() - . = ..() - - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/mask - chameleon_action.chameleon_name = "Mask" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - - voice_changer = new(src) - -/obj/item/clothing/mask/chameleon/Destroy() - QDEL_NULL(voice_changer) - return ..() - -/obj/item/clothing/mask/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/mask/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/shoes/chameleon - name = "black shoes" - icon_state = "black" - item_color = "black" - desc = "A pair of black shoes." - permeability_coefficient = 0.05 - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/shoes/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/shoes - chameleon_action.chameleon_name = "Shoes" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - -/obj/item/clothing/shoes/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/shoes/chameleon/noslip - name = "black shoes" - icon_state = "black" - item_color = "black" - desc = "A pair of black shoes." - flags = NOSLIP - -/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/storage/backpack/chameleon - name = "backpack" - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/storage/backpack/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/storage/backpack - chameleon_action.chameleon_name = "Backpack" - chameleon_action.initialize_disguises() - -/obj/item/storage/backpack/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/storage/backpack/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/storage/belt/chameleon - name = "toolbelt" - desc = "Holds tools." - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/storage/belt/chameleon/Initialize() - . = ..() - - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/storage/belt - chameleon_action.chameleon_name = "Belt" - chameleon_action.initialize_disguises() - -/obj/item/storage/belt/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/storage/belt/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/radio/headset/chameleon - name = "radio headset" - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/radio/headset/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/radio/headset - chameleon_action.chameleon_name = "Headset" - chameleon_action.initialize_disguises() - -/obj/item/radio/headset/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/radio/headset/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/pda/chameleon - name = "PDA" - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/pda/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/pda - chameleon_action.chameleon_name = "PDA" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/pda/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/pda/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/stamp/chameleon - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/stamp/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/stamp - chameleon_action.chameleon_name = "Stamp" - chameleon_action.initialize_disguises() - -/obj/item/stamp/chameleon/broken/Initialize() - . = ..() +#define EMP_RANDOMISE_TIME 300 + +/datum/action/chameleon_outfit + name = "Select Chameleon Outfit" + button_icon_state = "chameleon_outfit" + var/list/outfit_options //By default, this list is shared between all instances. It is not static because if it were, subtypes would not be able to have their own. If you ever want to edit it, copy it first. + +/datum/action/chameleon_outfit/New() + ..() + initialize_outfits() + +/datum/action/chameleon_outfit/proc/initialize_outfits() + var/static/list/standard_outfit_options + if(!standard_outfit_options) + standard_outfit_options = list() + for(var/path in subtypesof(/datum/outfit/job)) + var/datum/outfit/O = path + standard_outfit_options[initial(O.name)] = path + sortTim(standard_outfit_options, /proc/cmp_text_asc) + outfit_options = standard_outfit_options + +/datum/action/chameleon_outfit/Trigger() + return select_outfit(owner) + +/datum/action/chameleon_outfit/proc/select_outfit(mob/user) + if(!user || !IsAvailable()) + return FALSE + var/selected = input("Select outfit to change into", "Chameleon Outfit") as null|anything in outfit_options + if(!IsAvailable() || QDELETED(src) || QDELETED(user)) + return FALSE + var/outfit_type = outfit_options[selected] + if(!outfit_type) + return FALSE + var/datum/outfit/O = new outfit_type() + var/list/outfit_types = O.get_chameleon_disguise_info() + + for(var/V in user.chameleon_item_actions) + var/datum/action/item_action/chameleon/change/A = V + var/done = FALSE + for(var/T in outfit_types) + for(var/name in A.chameleon_list) + if(A.chameleon_list[name] == T) + A.update_look(user, T) + outfit_types -= T + done = TRUE + break + if(done) + break + //hardsuit helmets/suit hoods + if(ispath(O.suit, /obj/item/clothing/suit/hooded) && ishuman(user)) + var/mob/living/carbon/human/H = user + //make sure they are actually wearing the suit, not just holding it, and that they have a chameleon hat + if(istype(H.wear_suit, /obj/item/clothing/suit/chameleon) && istype(H.head, /obj/item/clothing/head/chameleon)) + var/helmet_type + var/obj/item/clothing/suit/hooded/hooded = O.suit + helmet_type = initial(hooded.hoodtype) + + if(helmet_type) + var/obj/item/clothing/head/chameleon/hat = H.head + hat.chameleon_action.update_look(user, helmet_type) + qdel(O) + return TRUE + + +/datum/action/item_action/chameleon/change + name = "Chameleon Change" + var/list/chameleon_blacklist = list() //This is a typecache + var/list/chameleon_list = list() + var/chameleon_type = null + var/chameleon_name = "Item" + + var/emp_timer + +/datum/action/item_action/chameleon/change/Grant(mob/M) + if(M && (owner != M)) + if(!M.chameleon_item_actions) + M.chameleon_item_actions = list(src) + var/datum/action/chameleon_outfit/O = new /datum/action/chameleon_outfit() + O.Grant(M) + else + M.chameleon_item_actions |= src + ..() + +/datum/action/item_action/chameleon/change/Remove(mob/M) + if(M && (M == owner)) + LAZYREMOVE(M.chameleon_item_actions, src) + if(!LAZYLEN(M.chameleon_item_actions)) + var/datum/action/chameleon_outfit/O = locate(/datum/action/chameleon_outfit) in M.actions + qdel(O) + ..() + +/datum/action/item_action/chameleon/change/proc/initialize_disguises() + if(button) + button.name = "Change [chameleon_name] Appearance" + + chameleon_blacklist |= typecacheof(target.type) + for(var/V in typesof(chameleon_type)) + if(ispath(V) && ispath(V, /obj/item)) + var/obj/item/I = V + if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT) || !initial(I.icon_state)) + continue + var/chameleon_item_name = "[initial(I.name)] ([initial(I.icon_state)])" + chameleon_list[chameleon_item_name] = I + +/datum/action/item_action/chameleon/change/proc/select_look(mob/user) + var/obj/item/picked_item + var/picked_name + picked_name = input("Select [chameleon_name] to change into", "Chameleon [chameleon_name]", picked_name) as null|anything in chameleon_list + if(!picked_name) + return + picked_item = chameleon_list[picked_name] + if(!picked_item) + return + update_look(user, picked_item) + +/datum/action/item_action/chameleon/change/proc/random_look(mob/user) + var/picked_name = pick(chameleon_list) + // If a user is provided, then this item is in use, and we + // need to update our icons and stuff + + if(user) + update_look(user, chameleon_list[picked_name]) + + // Otherwise, it's likely a random initialisation, so we + // don't have to worry + + else + update_item(chameleon_list[picked_name]) + +/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item) + if(isliving(user)) + var/mob/living/C = user + if(C.stat != CONSCIOUS) + return + + update_item(picked_item) + var/obj/item/thing = target + thing.update_slot_icon() + UpdateButtonIcon() + +/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item) + // Species-related variables are lists, which can not be retrieved using initial(). As such, we need to instantiate the picked item. + var/obj/item/P = new picked_item(null) + + target.name = P.name + target.desc = P.desc + target.icon_state = P.icon_state + + if(isitem(target)) + var/obj/item/I = target + + I.item_state = P.item_state + I.item_color = P.item_color + + I.icon_override = P.icon_override + I.sprite_sheets = P.sprite_sheets + + if(istype(I, /obj/item/clothing) && istype(P, /obj/item/clothing)) + var/obj/item/clothing/CL = I + var/obj/item/clothing/PCL = P + CL.flags_cover = PCL.flags_cover + + target.icon = P.icon + qdel(P) + +/datum/action/item_action/chameleon/change/Trigger() + if(!IsAvailable()) + return + + select_look(owner) + return 1 + +/datum/action/item_action/chameleon/change/proc/emp_randomise(var/amount = EMP_RANDOMISE_TIME) + START_PROCESSING(SSprocessing, src) + random_look(owner) + + var/new_value = world.time + amount + if(new_value > emp_timer) + emp_timer = new_value + +/datum/action/item_action/chameleon/change/process() + if(world.time > emp_timer) + STOP_PROCESSING(SSprocessing, src) + return + random_look(owner) + +/obj/item/clothing/under/chameleon + name = "black jumpsuit" + icon_state = "black" + item_state = "bl_suit" + item_color = "black" + desc = "It's a plain jumpsuit. It has a small dial on the wrist." + sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle?? + random_sensor = FALSE + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/under/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/under + chameleon_action.chameleon_name = "Jumpsuit" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/under/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/under/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/suit/chameleon + name = "armor" + desc = "A slim armored vest that protects against most types of damage." + icon_state = "armor" + item_state = "armor" + blood_overlay_type = "armor" + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/suit/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/suit + chameleon_action.chameleon_name = "Suit" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/suit/armor/abductor), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/suit/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/suit/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/glasses/chameleon + name = "Optical Meson Scanner" + desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." + icon_state = "meson" + item_state = "meson" + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/eyes.dmi', + "Drask" = 'icons/mob/species/drask/eyes.dmi', + "Grey" = 'icons/mob/species/grey/eyes.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/glasses/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/glasses + chameleon_action.chameleon_name = "Glasses" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + +/obj/item/clothing/glasses/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/glasses/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/gloves/chameleon + desc = "These gloves will protect the wearer from electric shock." + name = "insulated gloves" + icon_state = "yellow" + item_state = "ygloves" + + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/gloves/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/gloves + chameleon_action.chameleon_name = "Gloves" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/gloves, /obj/item/clothing/gloves/color), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/gloves/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/gloves/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/head/chameleon + name = "grey cap" + desc = "It's a baseball hat in a tasteful grey colour." + icon_state = "greysoft" + item_color = "grey" + + resistance_flags = NONE + armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/head.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/head/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/head + chameleon_action.chameleon_name = "Hat" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + +/obj/item/clothing/head/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/head/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/mask/chameleon + name = "gas mask" + desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate + icon_state = "gas_alt" + item_state = "gas_alt" + resistance_flags = NONE + armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + flags = AIRTIGHT | BLOCK_GAS_SMOKE_EFFECT + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + gas_transfer_coefficient = 0.01 + permeability_coefficient = 0.01 + flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/species/drask/mask.dmi', + "Grey" = 'icons/mob/species/grey/mask.dmi' + ) + + var/obj/item/voice_changer/voice_changer + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/mask/chameleon/Initialize() + . = ..() + + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/mask + chameleon_action.chameleon_name = "Mask" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + + voice_changer = new(src) + +/obj/item/clothing/mask/chameleon/Destroy() + QDEL_NULL(voice_changer) + return ..() + +/obj/item/clothing/mask/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/mask/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/shoes/chameleon + name = "black shoes" + icon_state = "black" + item_color = "black" + desc = "A pair of black shoes." + permeability_coefficient = 0.05 + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/shoes/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/shoes + chameleon_action.chameleon_name = "Shoes" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + +/obj/item/clothing/shoes/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/shoes/chameleon/noslip + name = "black shoes" + icon_state = "black" + item_color = "black" + desc = "A pair of black shoes." + flags = NOSLIP + +/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/storage/backpack/chameleon + name = "backpack" + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/back.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/storage/backpack/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/storage/backpack + chameleon_action.chameleon_name = "Backpack" + chameleon_action.initialize_disguises() + +/obj/item/storage/backpack/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/storage/backpack/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/storage/belt/chameleon + name = "toolbelt" + desc = "Holds tools." + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/storage/belt/chameleon/Initialize() + . = ..() + + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/storage/belt + chameleon_action.chameleon_name = "Belt" + chameleon_action.initialize_disguises() + +/obj/item/storage/belt/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/storage/belt/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/radio/headset/chameleon + name = "radio headset" + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/radio/headset/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/radio/headset + chameleon_action.chameleon_name = "Headset" + chameleon_action.initialize_disguises() + +/obj/item/radio/headset/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/radio/headset/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/pda/chameleon + name = "PDA" + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/pda/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/pda + chameleon_action.chameleon_name = "PDA" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/pda/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/pda/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/stamp/chameleon + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/stamp/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/stamp + chameleon_action.chameleon_name = "Stamp" + chameleon_action.initialize_disguises() + +/obj/item/stamp/chameleon/broken/Initialize() + . = ..() chameleon_action.emp_randomise(INFINITY) \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a0e3b169c7e..7508b6e5a25 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -189,7 +189,7 @@ BLIND // can't see anything var/clipped = 0 strip_delay = 20 put_on_delay = 40 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/gloves.dmi', "Drask" = 'icons/mob/species/drask/gloves.dmi' @@ -378,7 +378,7 @@ BLIND // can't see anything permeability_coefficient = 0.50 slowdown = SHOES_SLOWDOWN - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/shoes.dmi' ) @@ -568,12 +568,13 @@ BLIND // can't see anything permeability_coefficient = 0.90 slot_flags = SLOT_ICLOTHING armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - species_fit = list("Vox", "Drask", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/uniform.dmi', "Drask" = 'icons/mob/species/drask/uniform.dmi', "Grey" = 'icons/mob/species/grey/uniform.dmi' ) + var/has_sensor = TRUE//For the crew computer 2 = unable to change mode var/sensor_mode = SENSOR_OFF var/random_sensor = TRUE diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b527bb2717d..f489035715a 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -39,7 +39,7 @@ vision_flags = SEE_TURFS invis_view = SEE_INVISIBLE_MINIMUM //don't render darkness while wearing these prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -87,7 +87,7 @@ origin_tech = "magnets=2;engineering=1" prescription_upgradable = 0 scan_reagents = 1 //You can see reagents while wearing science goggles - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -111,7 +111,7 @@ desc = "These'll keep the soap out of your eyes." icon_state = "purple" item_state = "glasses" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) @@ -124,7 +124,7 @@ origin_tech = "materials=4;magnets=4;plasmatech=4;engineering=4" darkness_view = 8 invis_view = SEE_INVISIBLE_MINIMUM //don't render darkness while wearing these - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -136,7 +136,7 @@ desc = "Yarr." icon_state = "eyepatch" item_state = "eyepatch" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -148,7 +148,7 @@ icon_state = "monocle" item_state = "headset" // lol prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -162,7 +162,7 @@ item_state = "glasses" origin_tech = "magnets=3;engineering=3" vision_flags = SEE_OBJS - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -183,7 +183,7 @@ icon_state = "glasses" item_state = "glasses" prescription = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -200,7 +200,7 @@ name = "3D glasses" icon_state = "3d" item_state = "3d" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -211,7 +211,7 @@ desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme." icon_state = "gglasses" item_state = "gglasses" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -227,7 +227,7 @@ flash_protect = 1 tint = 1 prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -288,7 +288,7 @@ darkness_view = 1 flash_protect = 1 tint = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -314,7 +314,7 @@ actions_types = list(/datum/action/item_action/toggle) flash_protect = 2 tint = 2 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -383,7 +383,7 @@ origin_tech = "magnets=3" vision_flags = SEE_MOBS flash_protect = -1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -414,7 +414,7 @@ desc = "Strangely ancient technology used to help provide rudimentary eye cover." icon_state = "sun" item_state = "sunglasses" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -532,7 +532,7 @@ actions_types = list(/datum/action/item_action/toggle) up = 0 tint = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index d778ea5e63a..fb5ea498e9b 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -31,7 +31,7 @@ icon_state = "healthhud" origin_tech = "magnets=3;biotech=2" HUDType = DATA_HUD_MEDICAL_ADVANCED - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -60,7 +60,7 @@ icon_state = "diagnostichud" origin_tech = "magnets=2;engineering=2" HUDType = DATA_HUD_DIAGNOSTIC - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -84,7 +84,7 @@ var/global/list/jobs[0] HUDType = DATA_HUD_SECURITY_ADVANCED var/read_only = FALSE - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -127,7 +127,7 @@ flash_protect = 1 tint = 1 prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -142,7 +142,7 @@ desc = "A heads-up display capable of analyzing the health and status of plants growing in hydro trays and soil." icon_state = "hydroponichud" HUDType = DATA_HUD_HYDROPONIC - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -165,7 +165,7 @@ flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) @@ -181,7 +181,7 @@ flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index bbaf5b34e8b..70f0b1944de 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -59,7 +59,7 @@ icon_state = "welding" item_state = "welding" burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -126,7 +126,7 @@ icon_state = "swat" item_state = "swat" burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi' ) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 4a51349e165..0e9d2bac8de 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -11,7 +11,7 @@ flags_inv = 0 actions_types = list(/datum/action/item_action/toggle_helmet_light) burn_state = FIRE_PROOF - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -95,7 +95,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 35b4b6a75e0..5972e0a8048 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -13,7 +13,7 @@ max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT strip_delay = 60 burn_state = FIRE_PROOF - species_fit = list("Vox", "Drask", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Drask" = 'icons/mob/species/drask/helmet.dmi', @@ -202,7 +202,7 @@ obj/item/clothing/head/blob item_state = "blobhat" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi' ) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 62873252ad1..c3377296177 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -76,7 +76,7 @@ desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi' ) @@ -90,7 +90,7 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -103,7 +103,7 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -265,7 +265,7 @@ icon_state = "chickenhead" item_state = "chickensuit" flags = BLOCKHAIR - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -419,7 +419,7 @@ item_state = "griffinhat" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -452,7 +452,7 @@ icon_state = "papersack" flags = BLOCKHAIR flags_inv = HIDEFACE|HIDEEARS - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -463,7 +463,7 @@ icon_state = "papersack_smile" flags = BLOCKHAIR flags_inv = HIDEFACE|HIDEEARS - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index ab0dffee5dc..2675d778366 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -25,7 +25,7 @@ flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) actions_types = list(/datum/action/item_action/toggle) burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi', @@ -132,7 +132,7 @@ flags_inv = HIDEEARS cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -159,7 +159,7 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -230,7 +230,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH species_disguise = "High-tech robot" - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -256,7 +256,7 @@ desc = "A band of rubber with a very reflective looking mirror attached to the front of it. One of the early signs of medical budget cuts." icon_state = "head_mirror" item_state = "head_mirror" - species_fit = list("Vox, Drask") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', "Drask" = 'icons/mob/species/drask/head.dmi', diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 93d420f8ede..81d36884ef2 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -6,7 +6,7 @@ item_color = "cargo" var/flipped = 0 actions_types = list(/datum/action/item_action/flip_cap) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index d66daf59760..78034a3c0c8 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_SMALL actions_types = list(/datum/action/item_action/adjust) adjusted_flags = SLOT_HEAD - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -29,7 +29,7 @@ flags = BLOCKHAIR flags_inv = HIDEFACE w_class = WEIGHT_CLASS_SMALL - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 55c305cf449..84c6d9394c5 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -10,7 +10,7 @@ permeability_coefficient = 0.50 actions_types = list(/datum/action/item_action/adjust) burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey" ) + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -36,7 +36,6 @@ item_state = "medical" permeability_coefficient = 0.01 put_on_delay = 10 - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") /obj/item/clothing/mask/breath/vox desc = "A weirdly-shaped breath mask." diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 1bd53217770..9fbf2506edd 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -10,7 +10,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 231a353e153..85840d5db42 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -11,7 +11,7 @@ var/mute = MUZZLE_MUTE_ALL var/security_lock = FALSE // Requires brig access to remove 0 - Remove as normal var/locked = FALSE //Indicates if a mask is locked, should always start as 0. - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi' ) @@ -89,7 +89,7 @@ resist_time = 150 mute = MUZZLE_MUTE_MUFFLE flags = DROPDEL - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -197,7 +197,7 @@ permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 25, rad = 0) actions_types = list(/datum/action/item_action/adjust) - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -216,7 +216,7 @@ icon_state = "fake-moustache" flags_inv = HIDEFACE actions_types = list(/datum/action/item_action/pontificate) - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -295,7 +295,7 @@ var/voicechange = 0 var/temporaryname = " the Horse" var/originalname = "" - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/mask.dmi' ) @@ -390,7 +390,7 @@ desc = "It's the eater of worlds, and of children." icon_state = "pennywise_mask" item_state = "pennywise_mask" - species_fit = list("Vox") + flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR // Bandanas @@ -403,7 +403,7 @@ slot_flags = SLOT_MASK adjusted_flags = SLOT_HEAD icon_state = "bandbotany" - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/clothing/patreon/glasses.dm b/code/modules/clothing/patreon/glasses.dm index 8f795b212a2..f52d54f7df2 100644 --- a/code/modules/clothing/patreon/glasses.dm +++ b/code/modules/clothing/patreon/glasses.dm @@ -7,7 +7,7 @@ desc = "Row row!" icon_state = "gar" item_state = "gar" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm index bfcc69972e4..abee0cb9466 100644 --- a/code/modules/clothing/patreon/hats.dm +++ b/code/modules/clothing/patreon/hats.dm @@ -9,7 +9,7 @@ icon_state = "mushhat" item_state = "mushhat" flags = BLOCKHAIR - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -20,7 +20,7 @@ desc = "Poshness incarnate." icon_state = "goldtophat" item_state = "goldtophat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -45,7 +45,7 @@ icon_state = "guardhelm" item_state = "guardhelm" flags = BLOCKHAIR - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -57,7 +57,7 @@ icon_state = "blacksombrero" item_state = "blacksombrero" flags = BLOCKHAIR - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 1131f1ee648..099b46a10b9 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -9,7 +9,7 @@ var/obj/machinery/camera/camera var/has_camera = TRUE strip_delay = 130 - species_fit = list("Grey", "Vox") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi', "Vox" = 'icons/mob/species/vox/helmet.dmi' @@ -42,7 +42,7 @@ /obj/item/radio, /obj/item/analyzer, /obj/item/gun/energy/laser, /obj/item/gun/energy/pulse, \ /obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun, /obj/item/gun/projectile/automatic/lasercarbine, /obj/item/gun/energy/gun/blueshield, /obj/item/gun/energy/immolator/multi) strip_delay = 130 - species_fit = list("Drask", "Vox") + sprite_sheets = list( "Drask" = 'icons/mob/species/drask/suit.dmi', "Vox" = 'icons/mob/species/vox/suit.dmi' @@ -61,7 +61,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammacommander" item_color = "gammacommander" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/commander name = "emergency response team commander suit" @@ -73,7 +72,6 @@ name = "elite emergency response team commander suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gcommander" - species_fit = null //Security /obj/item/clothing/head/helmet/space/hardsuit/ert/security @@ -88,7 +86,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammasecurity" item_color = "gammasecurity" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/security name = "emergency response team security suit" @@ -100,7 +97,6 @@ name = "elite emergency response team security suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gsecurity" - species_fit = null //Engineer /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer @@ -116,7 +112,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammaengineer" item_color = "gammaengineer" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/engineer name = "emergency response team engineer suit" @@ -128,7 +123,6 @@ name = "elite emergency response team engineer suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gengineer" - species_fit = null //Medical /obj/item/clothing/head/helmet/space/hardsuit/ert/medical @@ -142,7 +136,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammamedical" item_color = "gammamedical" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/medical name = "emergency response team medical suit" @@ -153,7 +146,6 @@ name = "elite emergency response team medical suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gmedical" - species_fit = null //Janitor /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor @@ -167,8 +159,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammajanitor" item_color = "gammajanitor" - species_fit = null - /obj/item/clothing/suit/space/hardsuit/ert/janitor name = "emergency response team janitor suit" desc = "A suit worn by the janitorial of a Nanotrasen Emergency Response Team. Has purple highlights. Armoured, space ready, and fire resistant." @@ -178,7 +168,6 @@ name = "elite emergency response team janitor suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gjanitor" - species_fit = null //Paranormal /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 9a0354b6b0f..ead2c04016d 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -498,7 +498,7 @@ armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50) heat_protection = HEAD //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi' ) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 8a79b192d0c..b0fb7f91b7e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -8,7 +8,7 @@ permeability_coefficient = 0.01 armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/helmet.dmi' @@ -32,7 +32,7 @@ allowed = list(/obj/item/tank, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs) armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -72,7 +72,7 @@ armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20) strip_delay = 120 species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -99,13 +99,14 @@ name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" - species_fit = list("Grey, Drask") + sprite_sheets = list( "Grey" = 'icons/mob/species/Grey/head.dmi', "Drask" = 'icons/mob/species/Drask/helmet.dmi' ) flags = BLOCKHAIR | STOPSPRESSUREDMAGE flags_cover = HEADCOVERSEYES + /obj/item/clothing/head/helmet/space/santahat/attack_self(mob/user as mob) if(src.icon_state == "santahat") src.icon_state = "santahat_beard" @@ -158,7 +159,7 @@ item_state = "paramedic-eva-helmet" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox", "Grey" , "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/helmet.dmi', @@ -179,7 +180,7 @@ desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space." armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox", "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', "Skrell" = 'icons/mob/species/skrell/suit.dmi', @@ -199,7 +200,7 @@ desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies." armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Tajaran", "Unathi", "Vox", "Vulpkanin") + sprite_sheets = list( "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', "Unathi" = 'icons/mob/species/unathi/suit.dmi', @@ -222,7 +223,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) flash_protect = 0 species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Tajaran", "Unathi", "Vox", "Vulpkanin", "Grey") + sprite_sheets = list( "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi', @@ -243,7 +244,6 @@ icon_state = "spacemimehelmet" item_state = "spacemimehelmet" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null @@ -254,7 +254,6 @@ icon_state = "spacemime_suit" item_state = "spacemime_items" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null @@ -265,7 +264,6 @@ icon_state = "clownhelmet" item_state = "clownhelmet" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null @@ -276,6 +274,5 @@ icon_state = "spaceclown_suit" item_state = "spaceclown_items" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index 664e1dea237..1a2fabea889 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -1,6 +1,5 @@ //Unathi clothing. /obj/item/clothing/suit/unathi/ - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 87d79e5f5ff..088bc937b46 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -8,7 +8,7 @@ strip_delay = 60 put_on_delay = 40 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -91,7 +91,6 @@ desc = "A vest drenched in the blood of Greytide. It has seen better days." icon_state = "bloody_armor" item_state = "bloody_armor" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/secjacket @@ -137,7 +136,6 @@ icon_state = "jensencoat" item_state = "jensencoat" flags_inv = 0 - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/vest/warden @@ -383,7 +381,6 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT - species_fit = null sprite_sheets = null armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 0c85db3d533..86130ba8008 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -9,7 +9,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES burn_state = FIRE_PROOF - species_fit = list("Vox", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/head.dmi' @@ -33,7 +33,7 @@ strip_delay = 70 put_on_delay = 70 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -97,5 +97,5 @@ item_state = "bio_suit" strip_delay = 40 put_on_delay = 20 - species_fit = null + sprite_sheets = null diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 2d20a1d2937..0160a64bdb3 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -10,7 +10,7 @@ allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency_oxygen,/obj/item/rad_laser) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -25,7 +25,7 @@ /obj/item/healthanalyzer, /obj/item/flashlight, \ /obj/item/radio, /obj/item/tank/emergency_oxygen,/obj/item/rad_laser) armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -39,7 +39,7 @@ blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list(/obj/item/reagent_containers/spray/plantbgone,/obj/item/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator,/obj/item/reagent_containers/spray/pestspray,/obj/item/hatchet,/obj/item/storage/bag/plants) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -54,7 +54,7 @@ flags_inv = HIDEJUMPSUIT flags_size = ONESIZEFITSALL allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/emergency_oxygen) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -66,7 +66,7 @@ item_state = "bio_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -87,7 +87,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/chaplain_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -102,7 +102,7 @@ flags_inv = HIDESHOES|HIDEJUMPSUIT hoodtype = /obj/item/clothing/head/nun_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -142,7 +142,7 @@ permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list (/obj/item/kitchen/knife) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -185,7 +185,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_size = ONESIZEFITSALL - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -222,7 +222,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_size = ONESIZEFITSALL - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -236,14 +236,13 @@ blood_overlay_type = "armor" allowed = list (/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/emergency_oxygen) burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) //Lawyer /obj/item/clothing/suit/storage/lawyer - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -315,7 +314,7 @@ suit_adjusted = 1 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -330,7 +329,7 @@ ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -348,7 +347,7 @@ suit_adjusted = 1 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -360,7 +359,7 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index c7ab509fb2c..f3759a67786 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -9,7 +9,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/food/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/rad_laser) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0) - species_fit = list("Vox","Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', "Grey" = 'icons/mob/species/grey/suit.dmi' diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 13ef3e074da..af83aaa9f7c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -18,7 +18,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list (/obj/item/gun/energy/laser/tag/blue) burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -32,7 +32,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list (/obj/item/gun/energy/laser/tag/red) burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -45,7 +45,7 @@ desc = "Yarr." icon_state = "pirate_old" item_state = "pirate_old" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -55,7 +55,7 @@ desc = "Yarr." icon_state = "pirate" item_state = "pirate" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -117,7 +117,7 @@ item_state = "wcoat" blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -262,7 +262,7 @@ desc = "Your classic, non-racist poncho." icon_state = "classicponcho" item_state = "classicponcho" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -351,7 +351,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0) allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) - species_fit = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') /obj/item/clothing/head/winterhood @@ -363,7 +363,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT flags = NODROP|BLOCKHAIR flags_inv = HIDEEARS - species_fit = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/suit/hooded/wintercoat/captain @@ -465,7 +465,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen) hoodtype = /obj/item/clothing/head/hood - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -478,7 +478,7 @@ cold_protection = HEAD flags = NODROP|BLOCKHAIR flags_inv = HIDEEARS - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -540,7 +540,7 @@ desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in." icon_state = "ianshirt" item_state = "ianshirt" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -590,7 +590,7 @@ desc = "It makes you stand out. Just the opposite of why it's typically worn. Nice try trying to blend in while wearing it." icon_state = "brtrenchcoat" item_state = "brtrenchcoat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -600,7 +600,7 @@ desc = "That shade of black just makes you look a bit more evil. Good for those mafia types." icon_state = "bltrenchcoat" item_state = "bltrenchcoat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -617,7 +617,7 @@ suit_adjusted = 1 actions_types = list(/datum/action/item_action/openclose) adjust_flavour = "unzip" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -751,7 +751,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS actions_types = list(/datum/action/item_action/zipper) adjust_flavour = "unzip" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -797,7 +797,7 @@ ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -810,7 +810,7 @@ ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 267a3c86802..f3b06e30c83 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -33,7 +33,7 @@ /obj/item/clothing/suit/fire/firefighter icon_state = "firesuit" item_state = "firefighter" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -52,7 +52,7 @@ icon_state = "atmos_firesuit" item_state = "firesuit_atmos" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -75,7 +75,7 @@ strip_delay = 70 put_on_delay = 70 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/head.dmi' @@ -101,7 +101,7 @@ strip_delay = 70 put_on_delay = 70 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -129,7 +129,7 @@ strip_delay = 60 put_on_delay = 60 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', "Grey" = 'icons/mob/species/grey/head.dmi' @@ -152,7 +152,7 @@ strip_delay = 60 put_on_delay = 60 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index b1da17677de..bda05fe8d47 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -117,7 +117,7 @@ icon_state = "waistcoat" item_state = "waistcoat" item_color = "waistcoat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -436,7 +436,7 @@ icon_state = "cowboyshirt" item_state = "cowboyshirt" item_color = "cowboyshirt" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -447,7 +447,7 @@ icon_state = "cowboyshirt_s" item_state = "cowboyshirt_s" item_color = "cowboyshirt_s" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -458,7 +458,7 @@ icon_state = "cowboyshirt_white" item_state = "cowboyshirt_white" item_color = "cowboyshirt_white" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -469,7 +469,7 @@ icon_state = "cowboyshirt_whites" item_state = "cowboyshirt_whites" item_color = "cowboyshirt_whites" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -480,7 +480,7 @@ icon_state = "cowboyshirt_pink" item_state = "cowboyshirt_pink" item_color = "cowboyshirt_pink" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -491,7 +491,7 @@ icon_state = "cowboyshirt_pinks" item_state = "cowboyshirt_pinks" item_color = "cowboyshirt_pinks" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -502,7 +502,7 @@ icon_state = "cowboyshirt_navy" item_state = "cowboyshirt_navy" item_color = "cowboyshirt_navy" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -513,7 +513,7 @@ icon_state = "cowboyshirt_navys" item_state = "cowboyshirt_navys" item_color = "cowboyshirt_navys" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -524,7 +524,7 @@ icon_state = "cowboyshirt_red" item_state = "cowboyshirt_red" item_color = "cowboyshirt_red" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -535,7 +535,7 @@ icon_state = "cowboyshirt_reds" item_state = "cowboyshirt_reds" item_color = "cowboyshirt_reds" - species_fit = list("Vox", "Drask", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', "Drask" = 'icons/mob/species/drask/suit.dmi', diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 3b2e9c75a20..09d8c669ccf 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -78,7 +78,7 @@ desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden." icon_state = "webbing" item_color = "webbing" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 08c7c403ff5..e7f29305929 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -120,7 +120,7 @@ desc = "Groovy!" icon_state = "psyche" item_color = "psyche" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/uniform.dmi' ) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index da905dd1e75..cfd828aeab1 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -85,7 +85,7 @@ armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) flags_size = ONESIZEFITSALL strip_delay = 50 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/uniform.dmi' ) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index d2b32f720cf..c7ad35e5f47 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -323,7 +323,6 @@ if(!has_action) new /datum/action/item_action/openclose(jacket)//this actually works jacket.adjust_flavour = "unbutton" - jacket.species_fit = null jacket.sprite_sheets = null user.update_inv_wear_suit() qdel(src) @@ -345,7 +344,6 @@ M.desc = "It looks heavily modified, but otherwise functions as a gas mask. The words “Property of Yon-Dale†can be seen on the inner band." M.icon = 'icons/obj/custom_items.dmi' M.icon_state = "gas_tariq" - M.species_fit = list("Vulpkanin") M.sprite_sheets = list( "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) @@ -844,7 +842,6 @@ actions_types = list() ignore_suitadjust = 1 adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/suit/storage/labcoat/fluff/pulsecoat //ozewse : Daniel Harper : Donated to them by Runemeds, who is the original donor. @@ -934,7 +931,6 @@ desc = "A labcoat with a few markings denoting it as the labcoat of roboticist." icon = 'icons/obj/custom_items.dmi' icon_state = "aeneasrinil_open" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/jacket/fluff/kidosvest // Anxipal: Kido Qasteth @@ -946,7 +942,6 @@ ignore_suitadjust = 1 actions_types = list() adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/suit/jacket/fluff/jacksvest // Anxipal: Jack Harper @@ -957,7 +952,6 @@ ignore_suitadjust = TRUE actions_types = list() adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen @@ -997,7 +991,6 @@ desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves." icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_red_open" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/storage/labcoat/fluff/ionward_labcoat // Ionward: Gemini @@ -1005,7 +998,6 @@ desc = "A thin, faded, carbon fiber labcoat. On the back, a Technocracy vessel's logo. Inside, the name 'Gemini' is printed on the collar." icon = 'icons/obj/custom_items.dmi' icon_state = "ionward_labcoat_open" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/fluff/stobarico_greatcoat // Stobarico: F.U.R.R.Y @@ -1059,7 +1051,7 @@ desc = "A somewhat worn but well kept set of vox tactical webbing. It has a couple of pouches attached." icon = 'icons/obj/custom_items.dmi' icon_state = "k3_webbing" - species_fit = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/toggle) @@ -1338,7 +1330,6 @@ ignore_suitadjust = TRUE actions_types = list() adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/under/fluff/fox @@ -1481,7 +1472,6 @@ icon = 'icons/obj/clothing/ties.dmi' icon_state = "vest_black" item_state = "vest_black" - species_fit = null sprite_sheets = null /obj/item/clothing/under/pants/fluff/combat @@ -1498,7 +1488,6 @@ item_state = "elliot_windbreaker_open" adjust_flavour = "unzip" suit_adjusted = 1 - species_fit = null sprite_sheets = null /obj/item/storage/backpack/fluff/syndiesatchel //SkeletalElite: Rawkkihiki @@ -1723,7 +1712,6 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - species_fit = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi') icon_state = "kiaoutfit" item_state = "kiaoutfit" @@ -1747,7 +1735,6 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - species_fit = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/mask.dmi') icon_state = "kiamask" item_state = "kiamask" @@ -1785,4 +1772,3 @@ item_state = "voxbodysuit" item_color = "voxbodysuit" body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - species_fit = list("Vox") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index e55eee62dbc..6e1bbfb3fc3 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1217,7 +1217,7 @@ var/global/list/damage_icon_parts = list() //Adds a collar overlay above the helmet layer if the suit has one // Suit needs an identically named sprite in icons/mob/collar.dmi -// For suits with species_fit and sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi. +// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi. /mob/living/carbon/human/proc/update_collar(var/update_icons=1) remove_overlay(COLLAR_LAYER) var/icon/C = new('icons/mob/collar.dmi') diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index bfc87e0104c..0ebec2e724f 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -12,7 +12,7 @@ Contents: icon_state = "s-ninja(norm)" item_state = "s-ninja_mask" unacidable = 1 - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/vr/vr_goggles.dm b/code/modules/vr/vr_goggles.dm index c2a185b0ffa..f2df5d2189e 100644 --- a/code/modules/vr/vr_goggles.dm +++ b/code/modules/vr/vr_goggles.dm @@ -7,7 +7,7 @@ icon_state = "3d" item_state = "3d" prescription_upgradable = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/paradise.dme b/paradise.dme index f96d9d6da59..00f7f8df8d6 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1301,6 +1301,7 @@ #include "code\modules\client\preference\loadout\loadout_shoes.dm" #include "code\modules\client\preference\loadout\loadout_suit.dm" #include "code\modules\client\preference\loadout\loadout_uniform.dm" +#include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\ears\ears.dm" #include "code\modules\clothing\glasses\glasses.dm" @@ -1362,7 +1363,6 @@ #include "code\modules\clothing\suits\storage.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\wiz_robe.dm" -#include "code\modules\clothing\under\chameleon.dm" #include "code\modules\clothing\under\color.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\oldstation_uni.dm" From 68effd9d8368a9ef86896eadb220ce2c0c9fea2e Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Mon, 13 May 2019 17:22:57 -0400 Subject: [PATCH 09/30] The End --- code/__DEFINES/{tick.dm => _tick.dm} | 7 +- code/__DEFINES/callbacks.dm | 2 + code/__DEFINES/process_scheduler.dm | 34 -- code/__HELPERS/unsorted.dm | 32 +- code/controllers/ProcessScheduler/.gitignore | 6 - .../controllers/ProcessScheduler/LICENSE-AGPL | 212 --------- .../ProcessScheduler/LICENSE-CC-BY-NC | 1 - code/controllers/ProcessScheduler/README.md | 86 ---- code/controllers/ProcessScheduler/bower.json | 30 -- .../ProcessScheduler/core/process.dm | 406 ------------------ .../ProcessScheduler/core/processScheduler.dm | 238 ---------- .../controllers/ProcessScheduler/package.json | 28 -- code/controllers/failsafe.dm | 9 +- code/controllers/globals.dm | 8 +- code/controllers/master.dm | 18 +- code/controllers/subsystem.dm | 8 +- code/controllers/subsystem/ticker.dm | 14 +- code/controllers/verbs.dm | 34 +- code/datums/statclick.dm | 13 +- code/game/world.dm | 5 - .../living/silicon/ai/freelook/cameranet.dm | 2 +- code/modules/mob/mob.dm | 7 - paradise.dme | 5 +- 23 files changed, 80 insertions(+), 1125 deletions(-) rename code/__DEFINES/{tick.dm => _tick.dm} (52%) delete mode 100644 code/__DEFINES/process_scheduler.dm delete mode 100644 code/controllers/ProcessScheduler/.gitignore delete mode 100644 code/controllers/ProcessScheduler/LICENSE-AGPL delete mode 100644 code/controllers/ProcessScheduler/LICENSE-CC-BY-NC delete mode 100644 code/controllers/ProcessScheduler/README.md delete mode 100644 code/controllers/ProcessScheduler/bower.json delete mode 100644 code/controllers/ProcessScheduler/core/process.dm delete mode 100644 code/controllers/ProcessScheduler/core/processScheduler.dm delete mode 100644 code/controllers/ProcessScheduler/package.json diff --git a/code/__DEFINES/tick.dm b/code/__DEFINES/_tick.dm similarity index 52% rename from code/__DEFINES/tick.dm rename to code/__DEFINES/_tick.dm index 80550ab5e7a..666971e7209 100644 --- a/code/__DEFINES/tick.dm +++ b/code/__DEFINES/_tick.dm @@ -6,5 +6,8 @@ #define TICK_USAGE world.tick_usage //for general usage #define TICK_USAGE_REAL world.tick_usage //to be used where the result isn't checked -#define TICK_CHECK ( world.tick_usage > TICK_LIMIT_RUNNING ? stoplag() : 0 ) -#define CHECK_TICK if(world.tick_usage > TICK_LIMIT_RUNNING) stoplag() \ No newline at end of file +#define TICK_CHECK ( TICK_USAGE > Master.current_ticklimit ) +#define CHECK_TICK ( TICK_CHECK ? stoplag() : 0 ) + +#define TICK_CHECK_HIGH_PRIORITY ( TICK_USAGE > 95 ) +#define CHECK_TICK_HIGH_PRIORITY ( TICK_CHECK_HIGH_PRIORITY? stoplag() : 0 ) \ No newline at end of file diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm index c0d8ac15ace..26c81f8b143 100644 --- a/code/__DEFINES/callbacks.dm +++ b/code/__DEFINES/callbacks.dm @@ -1,2 +1,4 @@ +#define GLOBAL_PROC "some_magic_bullshit" + #define CALLBACK new /datum/callback #define INVOKE_ASYNC ImmediateInvokeAsync \ No newline at end of file diff --git a/code/__DEFINES/process_scheduler.dm b/code/__DEFINES/process_scheduler.dm deleted file mode 100644 index c6c3722d49f..00000000000 --- a/code/__DEFINES/process_scheduler.dm +++ /dev/null @@ -1,34 +0,0 @@ -// Process status defines -#define PROCESS_STATUS_IDLE 1 -#define PROCESS_STATUS_QUEUED 2 -#define PROCESS_STATUS_RUNNING 3 -#define PROCESS_STATUS_MAYBE_HUNG 4 -#define PROCESS_STATUS_PROBABLY_HUNG 5 -#define PROCESS_STATUS_HUNG 6 - -// Process time thresholds -#define PROCESS_DEFAULT_HANG_WARNING_TIME 300 // 30 seconds -#define PROCESS_DEFAULT_HANG_ALERT_TIME 600 // 60 seconds -#define PROCESS_DEFAULT_HANG_RESTART_TIME 900 // 90 seconds -#define PROCESS_DEFAULT_SCHEDULE_INTERVAL 50 // 50 ticks -#define PROCESS_DEFAULT_SLEEP_INTERVAL 20 // 20% of a tick -#define PROCESS_DEFAULT_DEFER_USAGE 90 // 90% of a tick - -// Sleep check macro -#define SCHECK if(world.tick_usage >= next_sleep_usage) defer() - -//Timing Controller -#define GLOBAL_PROC "some_magic_bullshit" - -#define DECLARE_GLOBAL_CONTROLLER(PROCESS,VARNAME) \ -/datum/controller/process/##PROCESS/assertGlobality(){\ - if(##VARNAME){\ - message_admins("Controller '[name]' tried to become global but found another controller there already. Deleting the old controller.");\ - qdel(##VARNAME);}\ - ##VARNAME = src;}\ -\ -/datum/controller/process/##PROCESS/releaseGlobality(){\ - if(##VARNAME == src)\ - ##VARNAME = null;\ - else\ - message_admins("Controller '[name]' asked to release global control in spite of not having it!");} diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 00724c94a03..eac827f4796 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1903,17 +1903,27 @@ var/mob/dview/dview_mob = new return matches //Key thing that stops lag. Cornerstone of performance in ss13, Just sitting here, in unsorted.dm. -/proc/stoplag() - . = 1 - sleep(world.tick_lag) - if(world.tick_usage > TICK_LIMIT_TO_RUN) //woke up, still not enough tick, sleep for more. - . += 2 - sleep(world.tick_lag*2) - if(world.tick_usage > TICK_LIMIT_TO_RUN) //woke up, STILL not enough tick, sleep for more. - . += 4 - sleep(world.tick_lag*4) - //you might be thinking of adding more steps to this, or making it use a loop and a counter var - // not worth it. + +//Increases delay as the server gets more overloaded, +//as sleeps aren't cheap and sleeping only to wake up and sleep again is wasteful +#define DELTA_CALC max(((max(TICK_USAGE, world.cpu) / 100) * max(Master.sleep_delta-1,1)), 1) + +//returns the number of ticks slept +/proc/stoplag(initial_delay) + if(!Master || !(Master.current_runlevel & RUNLEVELS_DEFAULT)) + sleep(world.tick_lag) + return 1 + if(!initial_delay) + initial_delay = world.tick_lag + . = 0 + var/i = DS2TICKS(initial_delay) + do + . += CEILING(i*DELTA_CALC, 1) + sleep(i*world.tick_lag*DELTA_CALC) + i *= 2 + while(TICK_USAGE > min(TICK_LIMIT_TO_RUN, Master.current_ticklimit)) + +#undef DELTA_CALC // This proc gets a list of all "points of interest" (poi's) that can be used by admins to track valuable mobs or atoms (such as the nuke disk). /proc/getpois(mobs_only=0,skip_mindless=0) diff --git a/code/controllers/ProcessScheduler/.gitignore b/code/controllers/ProcessScheduler/.gitignore deleted file mode 100644 index 5fe19e425bf..00000000000 --- a/code/controllers/ProcessScheduler/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/bower_components -/node_modules -/ProcessScheduler.dmb -/ProcessScheduler.int -/ProcessScheduler.rsc -/*.lk diff --git a/code/controllers/ProcessScheduler/LICENSE-AGPL b/code/controllers/ProcessScheduler/LICENSE-AGPL deleted file mode 100644 index abaa41e8296..00000000000 --- a/code/controllers/ProcessScheduler/LICENSE-AGPL +++ /dev/null @@ -1,212 +0,0 @@ -GNU AFFERO GENERAL PUBLIC LICENSE - -Version 3, 19 November 2007 - -Copyright © 2007 Free Software Foundation, Inc. -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. - -A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public. - -The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version. - -An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU Affero General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. - -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - -13. Remote Network Interaction; Use with the GNU General Public License. -Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. - -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License. - -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -Also add information on how to contact you by electronic and paper mail. - -If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements. - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . \ No newline at end of file diff --git a/code/controllers/ProcessScheduler/LICENSE-CC-BY-NC b/code/controllers/ProcessScheduler/LICENSE-CC-BY-NC deleted file mode 100644 index d0955f424af..00000000000 --- a/code/controllers/ProcessScheduler/LICENSE-CC-BY-NC +++ /dev/null @@ -1 +0,0 @@ -This work is licensed under the Creative Commons Attribution-NonCommercial 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. \ No newline at end of file diff --git a/code/controllers/ProcessScheduler/README.md b/code/controllers/ProcessScheduler/README.md deleted file mode 100644 index 610800ba374..00000000000 --- a/code/controllers/ProcessScheduler/README.md +++ /dev/null @@ -1,86 +0,0 @@ -ProcessScheduler -================ -A Goonstation release, maintained by Volundr - -##SUMMARY - -This is a mostly self-contained, fairly well-documented implementation of the main loop process architecture in use in Goonstation. - -##LICENSE - -This work is released under the following licenses. - -[![Creative Commons License](https://licensebuttons.net/l/by-nc/4.0/80x15.png)](http://creativecommons.org/licenses/by-nc/4.0/) - -This work is licensed under the Creative Commons Attribution-NonCommercial 4.0 International License. The complete text of this license is included in the file LICENSE-CC-BY-NC. - - -[![Affero GPL Version 3](http://www.gnu.org/graphics/agplv3-88x31.png)](http://www.gnu.org/licenses/agpl-3.0.html) - -This work is licensed under the Affero General Public License 3.0. The complete text of the license is included in the file LICENSE-AGPL. - -##INSTALLATION - -To integrate the process scheduler to your codebase, you will not need anything except the contents of the core/ folder. The rest of the project is simply for testing and to provide an example for the process scheduler code. - -### Test project setup -To compile and run the test project, you will require: - -- node.js -- BYOND - -Clone the repository to a path of your choosing, then change directory to it and execute: - -``` -npm install -g -bower install -g -``` - -Then you can either compile with DM or open the DM environment in DreamMaker and compile/run from there. - -##USAGE - -###BASICS -To use the process scheduler in your SS13 codebase, you'll need: - -- core/_defines.dm -- core/_stubs.dm -- core/process.dm -- core/processScheduler.dm -- core/processScheduler.js -- core/updateQueue.dm -- core/updateQueueWorker.dm - -To integrate, you can copy the contents of _defines.dm into your global defines file. Most ss13 codebases already have the code from _stubs.dm. - -The processScheduler is intended as a replacement for the old master_controller from r4407 and other fork codebases. To implement it, you need only to add the source files to your DM environment, and add the following code into world.New, above where the old master_controller is initialized. - -``` -processScheduler = new -processScheduler.setup() -processScheduler.start() -``` - -The processScheduler will automatically find all subtypes of process, and begin processing them. - -The interface code in test/processSchedulerView.dm is simply an example frontend, and can easily be rebuilt to use other styles, and/or render simple html without using javascript for refreshing the panel and killing processes. - -###DETAILS - -To implement a process, you have two options: - -1. Implement a raw loop-style processor -2. Implement an updateQueue processor - -There are clear examples of both of these paradigms in the code provided. Both styles are valid, but for processes that are just a loop calling an update proc on a bunch of objects, you should use the updateQueue. - -The updateQueue works by spawn(0)'ing your specified update proc, but it only puts one instance in the scheduler at a time. Examine the code for more details. The overall effect of this is that it doesn't block, and it lets update loops work concurrently. It enables a much smoother user experience. - -##Contributing - -I welcome pull requests and issue reports, and will try to merge/fix them as I have time. - -### Licensing for code submitted via PR: - -By submitting a pull request, you agree to release all original code submitted in the pull request under the [MIT License](http://opensource.org/licenses/MIT). You also agree that any code submitted is either your own work, or is public domain or under a equally or less restrictive license than the MIT license, or that you have the express written permission of the authors of the submitted code to submit the pull request. - diff --git a/code/controllers/ProcessScheduler/bower.json b/code/controllers/ProcessScheduler/bower.json deleted file mode 100644 index 9a6be56140d..00000000000 --- a/code/controllers/ProcessScheduler/bower.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "ProcessScheduler", - "main": "ProcessScheduler.js", - "version": "1.0.0", - "homepage": "https://github.com/goonstation/ProcessScheduler", - "authors": [ - "Volundr " - ], - "description": "BYOND SS13 Process Scheduler", - "keywords": [ - "byond", - "ss13", - "process", - "scheduler" - ], - "license": "CC-BY-NC", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "private": true, - "dependencies": { - "bootstrap2.3.2": "~2.3.2", - "jquery": "1.11.1", - "json2": "*" - } -} diff --git a/code/controllers/ProcessScheduler/core/process.dm b/code/controllers/ProcessScheduler/core/process.dm deleted file mode 100644 index f997109f90b..00000000000 --- a/code/controllers/ProcessScheduler/core/process.dm +++ /dev/null @@ -1,406 +0,0 @@ -// Process - -/datum/controller/process - /** - * State vars - */ - // Main controller ref - var/tmp/datum/controller/processScheduler/main - - // 1 if process is not running or queued - var/tmp/idle = 1 - - // 1 if process is queued - var/tmp/queued = 0 - - // 1 if process is running - var/tmp/running = 0 - - // 1 if process is blocked up - var/tmp/hung = 0 - - // 1 if process was killed - var/tmp/killed = 0 - - // Status text var - var/tmp/status - - // Previous status text var - var/tmp/previousStatus - - // 1 if process is disabled - var/tmp/disabled = 0 - - /** - * Config vars - */ - - // Process schedule interval - // This controls how often the process would run under ideal conditions. - // If the process scheduler sees that the process has finished, it will wait until - // this amount of time has elapsed from the start of the previous run to start the - // process running again. - var/tmp/schedule_interval = PROCESS_DEFAULT_SCHEDULE_INTERVAL // run every 50 ticks - - // Process sleep interval - // This controls how often the process will yield (call sleep(0)) while it is running. - // Every concurrent process should sleep periodically while running in order to allow other - // processes to execute concurrently. - var/tmp/sleep_interval = PROCESS_DEFAULT_SLEEP_INTERVAL - - // Defer usage; the tick usage at which this process will defer until the next tick - var/tmp/defer_usage = PROCESS_DEFAULT_DEFER_USAGE - - // hang_warning_time - this is the time (in 1/10 seconds) after which the server will begin to show "maybe hung" in the context window - var/tmp/hang_warning_time = PROCESS_DEFAULT_HANG_WARNING_TIME - - // hang_alert_time - After this much time(in 1/10 seconds), the server will send an admin debug message saying the process may be hung - var/tmp/hang_alert_time = PROCESS_DEFAULT_HANG_ALERT_TIME - - // hang_restart_time - After this much time(in 1/10 seconds), the server will automatically kill and restart the process. - var/tmp/hang_restart_time = PROCESS_DEFAULT_HANG_RESTART_TIME - - // Number of deciseconds to delay before starting the process - var/start_delay = 0 - - /** - * recordkeeping vars - */ - - // Records the time (1/10s timeofgame) at which the process last began running - var/tmp/run_start = 0 - - // Records the number of times this process has been killed and restarted - var/tmp/times_killed - - // Tick count - var/tmp/ticks = 0 - - var/tmp/last_task = "" - - var/tmp/last_object - - // How many times in the current run has the process deferred work till the next tick? - var/tmp/cpu_defer_count = 0 - - // Counts the number of times an exception has occurred; gets reset after 10 - var/tmp/list/exceptions = list() - - // The next tick_usage the process will sleep at - var/tmp/next_sleep_usage - - // Last run duration, in seconds - var/tmp/last_run_time = 0 - - // Last 20 run durations - var/tmp/list/last_twenty_run_times = list() - - // Highest run duration, in seconds - var/tmp/highest_run_time = 0 - - // Tick usage at start of current run (updates upon deferring) - var/tmp/tick_usage_start - - // Accumulated tick usage from before each deferral - var/tmp/tick_usage_accumulated = 0 - -/datum/controller/process/New(var/datum/controller/processScheduler/scheduler) - ..() - main = scheduler - previousStatus = "idle" - idle() - name = "process" - run_start = 0 - ticks = 0 - last_task = 0 - last_object = null - -/datum/controller/process/Destroy() - ..() - return QDEL_HINT_HARDDEL_NOW - -/datum/controller/process/proc/started() - // Initialize run_start so we can detect hung processes. - run_start = TimeOfGame - - // Initialize defer count - cpu_defer_count = 0 - - // Prepare usage tracking (defer() updates these) - tick_usage_start = world.tick_usage - tick_usage_accumulated = 0 - - running() - main.processStarted(src) - - onStart() - -/datum/controller/process/proc/finished() - ticks++ - recordRunTime() - idle() - main.processFinished(src) - - onFinish() - -/datum/controller/process/proc/recordRunTime() - // Convert from tick usage (100/tick) to seconds of CPU time used - var/total_usage = (tick_usage_accumulated + (world.tick_usage - tick_usage_start)) / 1000 * world.tick_lag - - last_run_time = total_usage - if(total_usage > highest_run_time) - highest_run_time = total_usage - if(last_twenty_run_times.len == 20) - last_twenty_run_times.Cut(1, 2) - last_twenty_run_times += total_usage - -/datum/controller/process/proc/doWork() - -/datum/controller/process/proc/setup() - -/datum/controller/process/proc/process_decrepit() - started() - doWork() - finished() - -/datum/controller/process/proc/running() - idle = 0 - queued = 0 - running = 1 - hung = 0 - setStatus(PROCESS_STATUS_RUNNING) - -/datum/controller/process/proc/idle() - queued = 0 - running = 0 - idle = 1 - hung = 0 - setStatus(PROCESS_STATUS_IDLE) - -/datum/controller/process/proc/queued() - idle = 0 - running = 0 - queued = 1 - hung = 0 - setStatus(PROCESS_STATUS_QUEUED) - -/datum/controller/process/proc/hung() - hung = 1 - setStatus(PROCESS_STATUS_HUNG) - -/datum/controller/process/proc/handleHung() - var/datum/lastObj = last_object - var/lastObjType = "null" - if(istype(lastObj)) - lastObjType = lastObj.type - - var/msg = "[name] process hung at tick #[ticks]. Process was unresponsive for [(TimeOfGame - run_start) / 10] seconds and was restarted. Last task: [last_task]. Last Object Type: [lastObjType]" - log_debug(msg) - message_admins(msg) - log_runtime(EXCEPTION(msg), src) - - main.restartProcess(src.name) - -/datum/controller/process/proc/kill() - if(!killed) - var/msg = "[name] process was killed at tick #[ticks]." - log_debug(msg) - message_admins(msg) - log_runtime(EXCEPTION(msg), src) - //finished() - - // Allow inheritors to clean up if needed - onKill() - - qdel(src) - -// Do not call this directly - use SHECK -/datum/controller/process/proc/defer() - if(killed) - // The kill proc is the only place where killed is set. - // The kill proc should have deleted this datum, and all sleeping procs that are - // owned by it. - CRASH("A killed process is still running somehow...") - if(hung) - // This will only really help if the doWork proc ends up in an infinite loop. - handleHung() - CRASH("Process [name] hung and was restarted.") - - tick_usage_accumulated += (world.tick_usage - tick_usage_start) - if(world.tick_usage < defer_usage) - sleep(0) - else - sleep(world.tick_lag) - cpu_defer_count++ - tick_usage_start = world.tick_usage - next_sleep_usage = min(world.tick_usage + sleep_interval, defer_usage) - -/datum/controller/process/proc/update() - // Clear delta - if(previousStatus != status) - setStatus(status) - - var/elapsedTime = getElapsedTime() - - if(hung) - handleHung() - return - else if(elapsedTime > hang_restart_time) - hung() - else if(elapsedTime > hang_alert_time) - setStatus(PROCESS_STATUS_PROBABLY_HUNG) - else if(elapsedTime > hang_warning_time) - setStatus(PROCESS_STATUS_MAYBE_HUNG) - - -/datum/controller/process/proc/getElapsedTime() - return TimeOfGame - run_start - -/datum/controller/process/proc/tickDetail() - return - -/datum/controller/process/proc/getContext() - return "[name][getAverageRunTime()][last_run_time][highest_run_time][ticks]\n" - -/datum/controller/process/proc/getContextData() - return list( - "name" = name, - "averageRunTime" = getAverageRunTime(), - "lastRunTime" = last_run_time, - "highestRunTime" = highest_run_time, - "ticks" = ticks, - "schedule" = schedule_interval, - "status" = getStatusText(), - "disabled" = disabled - ) - -/datum/controller/process/proc/getStatus() - return status - -/datum/controller/process/proc/getStatusText(var/s = 0) - if(!s) - s = status - switch(s) - if(PROCESS_STATUS_IDLE) - return "idle" - if(PROCESS_STATUS_QUEUED) - return "queued" - if(PROCESS_STATUS_RUNNING) - return "running" - if(PROCESS_STATUS_MAYBE_HUNG) - return "maybe hung" - if(PROCESS_STATUS_PROBABLY_HUNG) - return "probably hung" - if(PROCESS_STATUS_HUNG) - return "HUNG" - else - return "UNKNOWN" - -/datum/controller/process/proc/getPreviousStatus() - return previousStatus - -/datum/controller/process/proc/getPreviousStatusText() - return getStatusText(previousStatus) - -/datum/controller/process/proc/setStatus(var/newStatus) - previousStatus = status - status = newStatus - -/datum/controller/process/proc/setLastTask(var/task, var/object) - last_task = task - last_object = object - -/datum/controller/process/proc/_copyStateFrom(var/datum/controller/process/target) - main = target.main - name = target.name - schedule_interval = target.schedule_interval - sleep_interval = target.sleep_interval - run_start = 0 - times_killed = target.times_killed - ticks = target.ticks - last_task = target.last_task - last_object = target.last_object - copyStateFrom(target) - -/datum/controller/process/proc/copyStateFrom(var/datum/controller/process/target) - -/datum/controller/process/proc/onKill() - -/datum/controller/process/proc/onStart() - -/datum/controller/process/proc/onFinish() - -/datum/controller/process/proc/disable() - disabled = 1 - -/datum/controller/process/proc/enable() - disabled = 0 - -/datum/controller/process/proc/getAverageRunTime() - var/t = 0 - var/c = 0 - for(var/time in last_twenty_run_times) - t += time - c++ - - if(c > 0) - return t / c - return c - -/datum/controller/process/proc/getLastRunTime() - return last_run_time - -/datum/controller/process/proc/getHighestRunTime() - return highest_run_time - -/datum/controller/process/proc/getTicks() - return ticks - -/datum/controller/process/proc/statProcess() - var/averageRunTime = round(getAverageRunTime(), 0.001) - var/lastRunTime = round(last_run_time, 0.001) - var/highestRunTime = round(highest_run_time, 0.001) - var/deferTime = round(cpu_defer_count / 10 * world.tick_lag, 0.01) - if(!statclick) - statclick = new /obj/effect/statclick/debug(src) - stat("[name]", statclick.update("T#[getTicks()] | AR [averageRunTime] | LR [lastRunTime] | HR [highestRunTime] | D [deferTime]")) - -/datum/controller/process/proc/catchException(var/exception/e, var/thrower) - if(istype(e)) // Real runtimes go to the real error handler - log_runtime(e, thrower, "Caught by process: [name]") - return - var/etext = "[e]" - var/eid = "[e]" // Exception ID, for tracking repeated exceptions - var/ptext = "" // "processing..." text, for what was being processed (if known) - if(istype(e)) - etext += " in [e.file], line [e.line]" - eid = "[e.file]:[e.line]" - if(eid in exceptions) - if(exceptions[eid]++ >= 10) - return - else - exceptions[eid] = 1 - if(istype(thrower, /datum)) - var/datum/D = thrower - ptext = " processing [D.type]" - if(istype(thrower, /atom)) - var/atom/A = thrower - ptext += " ([A]) ([A.x],[A.y],[A.z])" - log_world("\[[time_stamp()]\] Process [name] caught exception[ptext]: [etext]") - if(exceptions[eid] >= 10) - log_world("This exception will now be ignored for ten minutes.") - spawn(6000) - exceptions[eid] = 0 - -/datum/controller/process/proc/catchBadType(var/datum/caught) - if(isnull(caught) || !istype(caught) || QDELETED(caught)) - return // Only bother with types we can identify and that don't belong - catchException("Type [caught.type] does not belong in process' queue") - -// This is called to make a controller THE global authority on a global variable - like `air_master` -/datum/controller/process/proc/assertGlobality() - return - -// Called to let another instance of the controller have the fun -/datum/controller/process/proc/releaseGlobality() - return diff --git a/code/controllers/ProcessScheduler/core/processScheduler.dm b/code/controllers/ProcessScheduler/core/processScheduler.dm deleted file mode 100644 index 66d101d178e..00000000000 --- a/code/controllers/ProcessScheduler/core/processScheduler.dm +++ /dev/null @@ -1,238 +0,0 @@ -// Singleton instance of game_controller_new, setup in world.New() -var/global/datum/controller/processScheduler/processScheduler - -/datum/controller/processScheduler - // Processes known by the scheduler - var/tmp/datum/controller/process/list/processes = new - - // Processes that are currently running - var/tmp/datum/controller/process/list/running = new - - // Processes that are idle - var/tmp/datum/controller/process/list/idle = new - - // Processes that are queued to run - var/tmp/datum/controller/process/list/queued = new - - // Process name -> process object map - var/tmp/datum/controller/process/list/nameToProcessMap = new - - // Process last queued times (world time) - var/tmp/datum/controller/process/list/last_queued = new - - // How long to sleep between runs (set to tick_lag in New) - var/tmp/scheduler_sleep_interval - - // Controls whether the scheduler is running or not - var/tmp/isRunning = 0 - - // Setup for these processes will be deferred until all the other processes are set up. - var/tmp/list/deferredSetupList = new - -/datum/controller/processScheduler/New() - ..() - // When the process scheduler is first new'd, tick_lag may be wrong, so these - // get re-initialized when the process scheduler is started. - // (These are kept here for any processes that decide to process before round start) - scheduler_sleep_interval = world.tick_lag - -/datum/controller/processScheduler/Destroy() - ..() - return QDEL_HINT_HARDDEL_NOW - -/** - * deferSetupFor - * @param path processPath - * If a process needs to be initialized after everything else, add it to - * the deferred setup list. On goonstation, only the ticker needs to have - * this treatment. - */ -/datum/controller/processScheduler/proc/deferSetupFor(var/processPath) - if(!(processPath in deferredSetupList)) - deferredSetupList += processPath - -/datum/controller/processScheduler/proc/setup() - // There can be only one - if(processScheduler && (processScheduler != src)) - qdel(src) - return 0 - - var/process - // Add all the processes we can find, except for the ticker - for(process in subtypesof(/datum/controller/process)) - if(!(process in deferredSetupList)) - addProcess(new process(src)) - - for(process in deferredSetupList) - addProcess(new process(src)) - -/datum/controller/processScheduler/proc/start() - isRunning = 1 - // tick_lag will have been set by now, so re-initialize these - scheduler_sleep_interval = world.tick_lag - updateStartDelays() - spawn(0) - process_decrepit() - -/datum/controller/processScheduler/proc/process_decrepit() - while(isRunning) - checkRunningProcesses() - queueProcesses() - runQueuedProcesses() - sleep(scheduler_sleep_interval) - -/datum/controller/processScheduler/proc/stop() - isRunning = 0 - -/datum/controller/processScheduler/proc/checkRunningProcesses() - for(var/datum/controller/process/p in running) - p.update() - - if(isnull(p)) // Process was killed - continue - - var/status = p.getStatus() - var/previousStatus = p.getPreviousStatus() - - // Check status changes - if(status != previousStatus) - //Status changed. - switch(status) - if(PROCESS_STATUS_PROBABLY_HUNG) - message_admins("Process '[p.name]' may be hung.") - if(PROCESS_STATUS_HUNG) - message_admins("Process '[p.name]' is hung and will be restarted.") - -/datum/controller/processScheduler/proc/queueProcesses() - for(var/datum/controller/process/p in processes) - // Don't double-queue, don't queue running processes - if(p.disabled || p.running || p.queued || !p.idle) - continue - - // If the process should be running by now, go ahead and queue it - if(world.time >= last_queued[p] + p.schedule_interval) - setQueuedProcessState(p) - -/datum/controller/processScheduler/proc/runQueuedProcesses() - for(var/datum/controller/process/p in queued) - runProcess(p) - -/datum/controller/processScheduler/proc/addProcess(var/datum/controller/process/process) - processes.Add(process) - process.idle() - idle.Add(process) - - process.assertGlobality() - // Set up process - process.setup() - - // Save process in the name -> process map - nameToProcessMap[process.name] = process - -/datum/controller/processScheduler/proc/replaceProcess(var/datum/controller/process/oldProcess, var/datum/controller/process/newProcess) - processes.Remove(oldProcess) - processes.Add(newProcess) - - oldProcess.releaseGlobality() - newProcess.assertGlobality() - newProcess.idle() - idle.Remove(oldProcess) - running.Remove(oldProcess) - queued.Remove(oldProcess) - idle.Add(newProcess) - - newProcess.last_run_time = oldProcess.last_run_time - newProcess.last_twenty_run_times = oldProcess.last_twenty_run_times - newProcess.highest_run_time = oldProcess.highest_run_time - - nameToProcessMap[newProcess.name] = newProcess - -/datum/controller/processScheduler/proc/updateStartDelays() - for(var/datum/controller/process/p in processes) - if(p.start_delay) - last_queued[p] = world.time - p.start_delay - -/datum/controller/processScheduler/proc/runProcess(var/datum/controller/process/process) - spawn(0) - process.process_decrepit() - -/datum/controller/processScheduler/proc/processStarted(var/datum/controller/process/process) - setRunningProcessState(process) - last_queued[process] = world.time - -/datum/controller/processScheduler/proc/processFinished(var/datum/controller/process/process) - setIdleProcessState(process) - -/datum/controller/processScheduler/proc/setIdleProcessState(var/datum/controller/process/process) - if(process in running) - running -= process - if(process in queued) - queued -= process - if(!(process in idle)) - idle += process - -/datum/controller/processScheduler/proc/setQueuedProcessState(var/datum/controller/process/process) - if(process in running) - running -= process - if(process in idle) - idle -= process - if(!(process in queued)) - queued += process - - // The other state transitions are handled internally by the process. - process.queued() - -/datum/controller/processScheduler/proc/setRunningProcessState(var/datum/controller/process/process) - if(process in queued) - queued -= process - if(process in idle) - idle -= process - if(!(process in running)) - running += process - -/datum/controller/processScheduler/proc/getStatusData() - var/list/data = new - - for(var/datum/controller/process/p in processes) - data.len++ - data[data.len] = p.getContextData() - - return data - -/datum/controller/processScheduler/proc/getProcessCount() - return processes.len - -/datum/controller/processScheduler/proc/hasProcess(var/processName as text) - if(nameToProcessMap[processName]) - return 1 - -/datum/controller/processScheduler/proc/killProcess(var/processName as text) - restartProcess(processName) - -/datum/controller/processScheduler/proc/restartProcess(var/processName as text) - if(hasProcess(processName)) - var/datum/controller/process/oldInstance = nameToProcessMap[processName] - var/datum/controller/process/newInstance = new oldInstance.type(src) - newInstance._copyStateFrom(oldInstance) - replaceProcess(oldInstance, newInstance) - oldInstance.kill() - -/datum/controller/processScheduler/proc/enableProcess(var/processName as text) - if(hasProcess(processName)) - var/datum/controller/process/process = nameToProcessMap[processName] - process.enable() - -/datum/controller/processScheduler/proc/disableProcess(var/processName as text) - if(hasProcess(processName)) - var/datum/controller/process/process = nameToProcessMap[processName] - process.disable() - -/datum/controller/processScheduler/proc/statProcesses() - if(!isRunning) - stat("Processes", "Scheduler not running") - return - if(!statclick) - statclick = new /obj/effect/statclick/debug(src) - stat("Processes", statclick.update("[processes.len] (R [running.len] / Q [queued.len] / I [idle.len])")) - for(var/datum/controller/process/p in processes) - p.statProcess() diff --git a/code/controllers/ProcessScheduler/package.json b/code/controllers/ProcessScheduler/package.json deleted file mode 100644 index f699553fc61..00000000000 --- a/code/controllers/ProcessScheduler/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "ProcessScheduler", - "version": "1.0.0", - "description": "BYOND SS13 Process Scheduler", - "main": "processScheduler.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "https://github.com/goonstation/ProcessScheduler.git" - }, - "keywords": [ - "byond", - "ss13", - "process", - "scheduler" - ], - "author": "Volundr", - "license": "CC-BY-NC", - "bugs": { - "url": "https://github.com/goonstation/ProcessScheduler/issues" - }, - "homepage": "https://github.com/goonstation/ProcessScheduler", - "dependencies": { - "bower": "*" - } -} diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 1d597f5e742..8b0f0b1987e 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -1,5 +1,10 @@ -GLOBAL_REAL(Failsafe, /datum/controller/failsafe) + /** + * Failsafe + * + * Pretty much pokes the MC to make sure it's still alive. + **/ +GLOBAL_REAL(Failsafe, /datum/controller/failsafe) /datum/controller/failsafe // This thing pretty much just keeps poking the master controller name = "Failsafe" @@ -92,6 +97,6 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) /datum/controller/failsafe/stat_entry() if(!statclick) - statclick = new/obj/effect/statclick/debug(src, "Initializing...") + statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])")) diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm index 62b83100fb4..543f0aed4b2 100644 --- a/code/controllers/globals.dm +++ b/code/controllers/globals.dm @@ -22,19 +22,19 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars) stack_trace("Some fucker qdel'd the global holder!") if(!force) return QDEL_HINT_LETMELIVE - + QDEL_NULL(statclick) gvars_datum_protected_varlist.Cut() gvars_datum_in_built_vars.Cut() - + GLOB = null return ..() /datum/controller/global_vars/stat_entry() if(!statclick) - statclick = new/obj/effect/statclick/debug(src, "Initializing...") - + statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) + stat("Globals:", statclick.update("Edit")) /datum/controller/global_vars/can_vv_get(var_name) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index fa2465854f3..10c6b42a369 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -203,12 +203,14 @@ GLOBAL_REAL(Master, /datum/controller/master) = new // Sort subsystems by display setting for easy access. sortTim(subsystems, /proc/cmp_subsystem_display) // Set world options. - if(sleep_offline_after_initializations) - world.sleep_offline = TRUE // world.fps = CONFIG_GET(number/fps) // TIGER TODO world.tick_lag = config.Ticklag var/initialized_tod = REALTIMEOFDAY + + if(sleep_offline_after_initializations) + world.sleep_offline = TRUE sleep(1) + initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10 // Loop. Master.StartProcessing(0) @@ -249,7 +251,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new //all this shit is here so that flag edits can be refreshed by restarting the MC. (and for speed) var/list/tickersubsystems = list() - var/list/runlevel_sorted_subsystems = list(list(), list(), list(), list(), list(), list(), list(), list()) //ensure we always have as many runlevels as we need to operate with no subsystems (8 currently) + var/list/runlevel_sorted_subsystems = list(list()) //ensure we always have at least one runlevel var/timer = world.time for(var/thing in subsystems) var/datum/controller/subsystem/SS = thing @@ -470,7 +472,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new else tick_precentage = tick_remaining - tick_precentage = max(tick_precentage*0.5, tick_precentage - queue_node.tick_overrun) + tick_precentage = max(tick_precentage * 0.5, tick_precentage - queue_node.tick_overrun) current_ticklimit = round(TICK_USAGE + tick_precentage) @@ -584,10 +586,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /datum/controller/master/stat_entry() if(!statclick) - statclick = new/obj/effect/statclick/debug(src, "Initializing...") + statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) - stat("Byond", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%))") - stat("Master Controller", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration])")) + stat("Byond:", "(FPS:[world.fps]) (TickCount:[world.time / world.tick_lag]) (TickDrift:[round(Master.tickdrift, 1)]([round((Master.tickdrift / (world.time / world.tick_lag)) * 100, 0.1)]%))") + stat("Master Controller:", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration])")) // Currently unimplemented /datum/controller/master/StartLoadingMap() @@ -613,4 +615,4 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(client_count < config.disable_high_pop_mc_mode_amount) processing = config.base_mc_tick_rate else if(client_count > config.high_pop_mc_mode_amount) - processing = config.high_pop_mc_tick_rate + processing = config.high_pop_mc_tick_rate \ No newline at end of file diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index b2b0e63d99b..7ba1b68d4a6 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -63,7 +63,7 @@ //Sleeping in here prevents future fires until returned. /datum/controller/subsystem/proc/fire(resumed = 0) flags |= SS_NO_FIRE - throw EXCEPTION("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.") + CRASH("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.") /datum/controller/subsystem/Destroy() dequeue() @@ -168,7 +168,9 @@ //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc. /datum/controller/subsystem/stat_entry(msg) if(!statclick) - statclick = new/obj/effect/statclick/debug(src, "Initializing...") + statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) + + if(can_fire && !(SS_NO_FIRE & flags)) msg = "[round(cost, 1)]ms | [round(tick_usage, 1)]%([round(tick_overrun, 1)]%) | [round(ticks, 0.1)]\t[msg]" @@ -212,4 +214,4 @@ next_fire = world.time + wait if("queued_priority") //editing this breaks things. return 0 - . = ..() + . = ..() \ No newline at end of file diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 668dfe5a3d6..fafc244af14 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(ticker) world.name = "[config.server_name]: [station_name()]" else world.name = station_name() - + return ..() @@ -75,11 +75,11 @@ SUBSYSTEM_DEF(ticker) if(GAME_STATE_PREGAME) // This is so we dont have sleeps in controllers, because that is a bad, bad thing pregame_timeleft = max(0,round_start_time - world.time) - + if(pregame_timeleft <= 600 && !tipped) // 60 seconds send_tip_of_the_round() tipped = TRUE - + if(pregame_timeleft <= 0 || force_start) current_state = GAME_STATE_SETTING_UP Master.SetRunLevel(RUNLEVEL_SETUP) @@ -278,14 +278,6 @@ SUBSYSTEM_DEF(ticker) auto_toggle_ooc(0) // Turn it off round_start_time = world.time - /* DONE THROUGH PROCESS SCHEDULER - supply_controller.process() //Start the supply shuttle regenerating points -- TLE - master_controller.process() //Start master_controller.process() - lighting_controller.process() //Start processing DynamicAreaLighting updates - */ - - processScheduler.start() - if(config.sql_enabled) spawn(3000) statistic_cycle() // Polls population totals regularly and stores them in an SQL DB diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index 55d68d9ea1a..60718af6525 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -2,24 +2,26 @@ //TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done -/client/proc/restart_controller(controller in list("Master","Failsafe")) +/client/proc/restart_controller(controller in list("Master", "Failsafe")) set category = "Debug" set name = "Restart Controller" set desc = "Restart one of the various periodic loop controllers for the game (be careful!)" - if(!holder) return - usr = null - src = null + if(!holder) + return switch(controller) + if("Master") + Recreate_MC() + feedback_add_details("admin_verb","RMaster") if("Failsafe") new /datum/controller/failsafe() feedback_add_details("admin_verb","RFailsafe") - message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.") - return -/client/proc/debug_controller(controller in list("failsafe","Scheduler","StonedMaster","Ticker","Air","Jobs","Sun","Radio","Configuration","pAI", - "Cameras","Garbage", "Transfer Controller","Event","Alarm","Nano","Vote","Fires", - "Mob","NPC AI","Shuttle","Timer","Weather","Space","Mob Hunt Server")) + message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.") + +/client/proc/debug_controller(controller in list("failsafe", "Master", "Ticker", "Air", "Jobs", "Sun", "Radio", "Configuration", "pAI", + "Cameras", "Garbage", "Event", "Alarm", "Nano", "Vote", "Fires", + "Mob", "NPC Pool", "Shuttle", "Timer", "Weather", "Space", "Mob Hunt Server")) set category = "Debug" set name = "Debug Controller" set desc = "Debug the various periodic loop controllers for the game (be careful!)" @@ -29,10 +31,7 @@ if("failsafe") debug_variables(Failsafe) feedback_add_details("admin_verb", "dfailsafe") - if("Scheduler") - debug_variables(processScheduler) - feedback_add_details("admin_verb","DprocessScheduler") - if("StonedMaster") + if("Master") debug_variables(Master) feedback_add_details("admin_verb","Dsmc") if("Ticker") @@ -59,15 +58,15 @@ if("Cameras") debug_variables(cameranet) feedback_add_details("admin_verb","DCameras") + if("Garbage") + debug_variables(SSgarbage) + feedback_add_details("admin_verb","DGarbage") if("Event") debug_variables(SSevents) feedback_add_details("admin_verb","DEvent") if("Alarm") debug_variables(SSalarms) feedback_add_details("admin_verb", "DAlarm") - if("Garbage") - debug_variables(SSgarbage) - feedback_add_details("admin_verb","DGarbage") if("Nano") debug_variables(SSnanoui) feedback_add_details("admin_verb","DNano") @@ -99,5 +98,4 @@ debug_variables(SSmob_hunt) feedback_add_details("admin_verb","DMobHuntServer") - message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") - return + message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") \ No newline at end of file diff --git a/code/datums/statclick.dm b/code/datums/statclick.dm index c7273e4744b..11a3ed41ce3 100644 --- a/code/datums/statclick.dm +++ b/code/datums/statclick.dm @@ -1,12 +1,13 @@ -// Not TECHNICALLY a datum, but this should never be instantiated -// outside of the stat panel // Clickable stat() button /obj/effect/statclick var/target -/obj/effect/statclick/New(ntarget, text) - target = ntarget +INITIALIZE_IMMEDIATE(/obj/effect/statclick) + +/obj/effect/statclick/Initialize(mapload, text, target) + . = ..() name = text + src.target = target /obj/effect/statclick/proc/update(text) name = text @@ -19,10 +20,6 @@ if(!is_admin(usr) || !target) return if(!class) - if(istype(target, /datum/controller/process)) - class = "process" - else if(istype(target, /datum/controller/processScheduler)) - class = "scheduler" if(istype(target, /datum/controller/subsystem)) class = "subsystem" else if(istype(target, /datum/controller)) diff --git a/code/game/world.dm b/code/game/world.dm index 0341699a254..b7f8b9bdc98 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -30,10 +30,6 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG Master.Initialize(10, FALSE) - processScheduler = new - spawn(1) - processScheduler.setup() - #undef RECOMMENDED_VERSION @@ -306,7 +302,6 @@ var/world_topic_spam_protect_time = world.timeofday log_game("Rebooting world. [reason]") //kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) - processScheduler.stop() Master.Shutdown() //run SS shutdowns shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index 6d12559ee9b..290a3c64e6e 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -184,7 +184,7 @@ var/datum/cameranet/cameranet = new() /* /datum/cameranet/proc/stat_entry() if(!statclick) - statclick = new/obj/effect/statclick/debug("Initializing...", src) + statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) stat(name, statclick.update("Cameras: [cameranet.cameras.len] | Chunks: [cameranet.chunks.len]")) */ diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e7ea036fed1..1a6697e8628 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -968,13 +968,6 @@ var/list/slot_equipment_priority = list( \ if(is_admin(src)) - if(statpanel("DI")) //not looking at that panel - stat("Loc", "([x], [y], [z]) [loc]") - stat("CPU", "[world.cpu]") - stat("Instances", "[world.contents.len]") - - if(processScheduler) - processScheduler.statProcesses() if(statpanel("MC")) //looking at that panel var/turf/T = get_turf(client.eye) stat("Location:", COORD(T)) diff --git a/paradise.dme b/paradise.dme index 79c465913f7..60935d44dcf 100644 --- a/paradise.dme +++ b/paradise.dme @@ -17,6 +17,7 @@ #include "code\world.dm" #include "code\__DEFINES\_globals.dm" #include "code\__DEFINES\_readme.dm" +#include "code\__DEFINES\_tick.dm" #include "code\__DEFINES\admin.dm" #include "code\__DEFINES\antagonists.dm" #include "code\__DEFINES\atmospherics.dm" @@ -49,7 +50,6 @@ #include "code\__DEFINES\pda.dm" #include "code\__DEFINES\pipes.dm" #include "code\__DEFINES\preferences.dm" -#include "code\__DEFINES\process_scheduler.dm" #include "code\__DEFINES\qdel.dm" #include "code\__DEFINES\radio.dm" #include "code\__DEFINES\reagents.dm" @@ -62,7 +62,6 @@ #include "code\__DEFINES\station_goals.dm" #include "code\__DEFINES\status_effects.dm" #include "code\__DEFINES\subsystems.dm" -#include "code\__DEFINES\tick.dm" #include "code\__DEFINES\typeids.dm" #include "code\__DEFINES\vv.dm" #include "code\__DEFINES\zlevel.dm" @@ -198,8 +197,6 @@ #include "code\controllers\master.dm" #include "code\controllers\subsystem.dm" #include "code\controllers\verbs.dm" -#include "code\controllers\ProcessScheduler\core\process.dm" -#include "code\controllers\ProcessScheduler\core\processScheduler.dm" #include "code\controllers\subsystem\air.dm" #include "code\controllers\subsystem\alarm.dm" #include "code\controllers\subsystem\assets.dm" From f28cdd6929f0ced8270d836de0c291e992e74087 Mon Sep 17 00:00:00 2001 From: Citinited Date: Tue, 14 May 2019 22:09:55 +0100 Subject: [PATCH 10/30] Makes the radial menu close option more obvious --- icons/mob/radial.dmi | Bin 3303 -> 3562 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/radial.dmi b/icons/mob/radial.dmi index ba3179a42141d35eb72c47da7b30837da5ce09b3..3951523ebc1495dc313eb43385b13702b617034a 100644 GIT binary patch delta 3341 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 Date: Fri, 17 May 2019 20:24:11 +0200 Subject: [PATCH 11/30] smartfridge now visually reflect their content --- .../kitchen_machinery/smartfridge.dm | 22 +++++++++++++----- icons/obj/vending.dmi | Bin 95446 -> 95094 bytes 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index d70db0658e8..9c11035ea11 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -77,7 +77,7 @@ name = "\improper Refrigerated Medicine Storage" desc = "A refrigerated storage unit for storing medicine and chemicals." icon_state = "smartfridge" //To fix the icon in the map editor. - icon_on = "smartfridge_chem" + icon_on = "smartfridge" /obj/machinery/smartfridge/medbay/accept_check(obj/item/O) if(istype(O,/obj/item/reagent_containers/glass)) @@ -104,7 +104,7 @@ name = "\improper Secure Refrigerated Medicine Storage" desc = "A refrigerated storage unit for storing medicine and chemicals." icon_state = "smartfridge" //To fix the icon in the map editor. - icon_on = "smartfridge_chem" + icon_on = "smartfridge" req_one_access_txt = "5;33" /obj/machinery/smartfridge/secure/medbay/accept_check(obj/item/O) @@ -122,7 +122,7 @@ name = "\improper Smart Chemical Storage" desc = "A refrigerated storage unit for medicine and chemical storage." icon_state = "smartfridge" //To fix the icon in the map editor. - icon_on = "smartfridge_chem" + icon_on = "smartfridge" req_access_txt = "33" var/list/spawn_meds = list() @@ -139,6 +139,7 @@ item_quants[I.name] = 1 SSnanoui.update_uis(src) amount-- + update_icon() /obj/machinery/smartfridge/chemistry/accept_check(obj/item/O) if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers)) @@ -189,10 +190,17 @@ /obj/machinery/smartfridge/update_icon() if(stat & (BROKEN|NOPOWER)) - icon_state = icon_off + icon_state = "[initial(icon_state)]-off" else - icon_state = icon_on - + switch(contents.len) + if(0) + icon_state = "[initial(icon_state)]" + if(1 to 25) + icon_state = "[initial(icon_state)]1" + if(26 to 75) + icon_state = "[initial(icon_state)]2" + if(76 to INFINITY) + icon_state = "[initial(icon_state)]3" /******************* * Item Adding @@ -231,6 +239,7 @@ if(load(O, user)) user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].") SSnanoui.update_uis(src) + update_icon() else if(istype(O, /obj/item/storage/bag)) var/obj/item/storage/bag/P = O @@ -244,6 +253,7 @@ to_chat(user, "Some items are refused.") SSnanoui.update_uis(src) + update_icon() else if(!istype(O, /obj/item/card/emag)) to_chat(user, "\The [src] smartly refuses [O].") diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 66dbdc88c100cfb86e9092cf643e2b6b1588aa13..0150b70a5b67f6a846496151a83132e1b520325b 100755 GIT binary patch delta 38285 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 delta 38640 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 dSzHrREoMi+pQUHknZUr~>J?MH5* Date: Sun, 19 May 2019 20:04:26 +0200 Subject: [PATCH 12/30] Gamma borgs are now reset when security level is dropped below Gamma --- .../objects/items/robot/robot_upgrades.dm | 26 ++---------------- .../modules/mob/living/silicon/robot/robot.dm | 27 ++++++++++++++++++- .../security_levels/security levels.dm | 21 +++++++-------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 0b9f6c3aca9..a13bce6fb61 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -31,31 +31,9 @@ if(..()) return - R.notify_ai(2) + R.reset_module() - R.uneq_all() - R.sight_mode = null - R.hands.icon_state = "nomod" - R.icon_state = "robot" - R.module.remove_subsystems_and_actions(R) - QDEL_NULL(R.module) - - R.camera.network.Remove(list("Engineering", "Medical", "Mining Outpost")) - R.rename_character(R.real_name, R.get_default_name("Default")) - R.languages = list() - R.speech_synthesizer_langs = list() - - R.update_icons() - R.update_headlamp() - - R.speed = 0 // Remove upgrades. - R.ionpulse = 0 - R.magpulse = 0 - R.add_language("Robot Talk", 1) - - R.status_flags |= CANPUSH - - return 1 + return TRUE /obj/item/borg/upgrade/rename name = "cyborg reclassification board" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index da793b2f3d3..d716c397111 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -287,7 +287,7 @@ var/list/robot_verbs_default = list( if(islist(force_modules) && force_modules.len) modules = force_modules.Copy() if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis) - to_chat(src, "Crisis mode active. Combat module available.") + to_chat(src, "Crisis mode active. The combat module is now available.") modules += "Combat" if(mmi != null && mmi.alien) modules = list("Hunter") @@ -415,6 +415,31 @@ var/list/robot_verbs_default = list( radio.config(module.channels) notify_ai(2) +/mob/living/silicon/robot/proc/reset_module() + notify_ai(2) + + uneq_all() + sight_mode = null + hands.icon_state = "nomod" + icon_state = "robot" + module.remove_subsystems_and_actions(src) + QDEL_NULL(module) + + camera.network.Remove(list("Engineering", "Medical", "Mining Outpost")) + rename_character(real_name, get_default_name("Default")) + languages = list() + speech_synthesizer_langs = list() + + update_icons() + update_headlamp() + + speed = 0 // Remove upgrades. + ionpulse = FALSE + magpulse = FALSE + add_language("Robot Talk", 1) + + status_flags |= CANPUSH + //for borg hotkeys, here module refers to borg inv slot, not core module /mob/living/silicon/robot/verb/cmd_toggle_module(module as num) set name = "Toggle Module" diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm index 050326891fb..c24874cb39e 100644 --- a/code/modules/security_levels/security levels.dm +++ b/code/modules/security_levels/security levels.dm @@ -31,6 +31,15 @@ // Mark down this time to prevent shuttle cheese SSshuttle.emergency_sec_level_time = world.time + // Reset gamma borgs if the new security level is lower than Gamma. + if(level < SEC_LEVEL_GAMMA) + for(var/M in GLOB.silicon_mob_list) + if(isrobot(M)) + var/mob/living/silicon/robot/R = M + if(istype(R.module, /obj/item/robot_module/combat)) + R.reset_module() + to_chat(R, "Crisis mode deactivated. The combat module is no longer available and your module has been reset.") + switch(level) if(SEC_LEVEL_GREEN) security_announcement_down.Announce("All threats to the station have passed. All weapons need to be holstered and privacy laws are once again fully enforced.","Attention! Security level lowered to green.") @@ -176,15 +185,3 @@ return SEC_LEVEL_EPSILON if("delta") return SEC_LEVEL_DELTA - - -/*DEBUG -/mob/verb/set_thing0() - set_security_level(0) -/mob/verb/set_thing1() - set_security_level(1) -/mob/verb/set_thing2() - set_security_level(2) -/mob/verb/set_thing3() - set_security_level(3) -*/ From 1b14f705e00132d402fd5ec0f72a389e0e1b7d0e Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sun, 19 May 2019 20:08:19 +0200 Subject: [PATCH 13/30] Add crisis check --- code/modules/security_levels/security levels.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm index c24874cb39e..3b1e56e0c2d 100644 --- a/code/modules/security_levels/security levels.dm +++ b/code/modules/security_levels/security levels.dm @@ -36,7 +36,7 @@ for(var/M in GLOB.silicon_mob_list) if(isrobot(M)) var/mob/living/silicon/robot/R = M - if(istype(R.module, /obj/item/robot_module/combat)) + if(istype(R.module, /obj/item/robot_module/combat) && !R.crisis) R.reset_module() to_chat(R, "Crisis mode deactivated. The combat module is no longer available and your module has been reset.") From 0e3645a27d6480e3fdbd3c9cba97913ff375ea36 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 19 May 2019 14:24:12 -0400 Subject: [PATCH 14/30] taketickets --- code/controllers/subsystem/tickets/tickets.dm | 7 ++++--- code/modules/admin/admin.dm | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 73279033849..ea210b95ee7 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -335,8 +335,8 @@ UI STUFF return TRUE //Sends a message to the designated staff -/datum/controller/subsystem/tickets/proc/message_staff(var/msg) - message_adminTicket(msg) +/datum/controller/subsystem/tickets/proc/message_staff(var/msg, var/alt = FALSE) + message_adminTicket(msg, alt) /datum/controller/subsystem/tickets/Topic(href, href_list) @@ -404,5 +404,6 @@ UI STUFF /datum/controller/subsystem/tickets/proc/takeTicket(var/index) if(assignStaffToTicket(usr.client, index)) - message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]") + span_text = "" + message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2a981e8b9c4..1a9f38b1486 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -21,8 +21,11 @@ var/global/nologevent = 0 to_chat(C, msg) -/proc/message_adminTicket(var/msg) - msg = "ADMIN TICKET: [msg]" +/proc/message_adminTicket(var/msg, var/alt = FALSE) + if(alt) + msg = "ADMIN TICKET: [msg]" + else + msg = "ADMIN TICKET: [msg]" for(var/client/C in GLOB.admins) if(R_ADMIN & C.holder.rights) if(C.prefs && !(C.prefs.toggles & CHAT_NO_TICKETLOGS)) From 0a65713126b25114749470c409094713fdcb7604 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 19 May 2019 14:54:03 -0400 Subject: [PATCH 15/30] fix --- code/controllers/subsystem/tickets/tickets.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index ea210b95ee7..7363d8e0ffd 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -404,6 +404,5 @@ UI STUFF /datum/controller/subsystem/tickets/proc/takeTicket(var/index) if(assignStaffToTicket(usr.client, index)) - span_text = "" - message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) + message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].") From 94afabee9c7830d2de2903e9dd2b3e5cf9c531ef Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 19 May 2019 15:13:00 -0400 Subject: [PATCH 16/30] fix2 --- code/controllers/subsystem/tickets/tickets.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 7363d8e0ffd..cf9aed29e83 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -404,5 +404,8 @@ UI STUFF /datum/controller/subsystem/tickets/proc/takeTicket(var/index) if(assignStaffToTicket(usr.client, index)) - message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) + if(span_text == "") + message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]") + else + message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].") From 8fed0ac75cb4deb6ce667dbde02c2fc7bbd43986 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 23 May 2019 19:35:35 +0200 Subject: [PATCH 17/30] Re-add ghost space transitions, add ghost z level registering --- code/controllers/subsystem/mobs.dm | 2 ++ code/game/turfs/space/space.dm | 5 +++++ code/modules/mob/dead/dead.dm | 31 +++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 20061d7489b..17edb6410fa 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -6,12 +6,14 @@ SUBSYSTEM_DEF(mobs) var/list/currentrun = list() var/static/list/clients_by_zlevel[][] + var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that. /datum/controller/subsystem/mobs/stat_entry() ..("P:[GLOB.mob_list.len]") /datum/controller/subsystem/mobs/Initialize(start_timeofday) clients_by_zlevel = new /list(world.maxz,0) + dead_players_by_zlevel = new /list(world.maxz,0) return ..() /datum/controller/subsystem/mobs/fire(resumed = 0) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 77e8b400bfb..53c79000c26 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -252,3 +252,8 @@ /turf/space/proc/remove_transitions() destination_z = initial(destination_z) + +/turf/space/attack_ghost(mob/dead/observer/user) + if(destination_z) + var/turf/T = locate(destination_x, destination_y, destination_z) + user.forceMove(T) \ No newline at end of file diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index f34aa75cd5e..c7eb3357618 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -1,4 +1,33 @@ +/mob/dead/Login() + . = ..() + var/turf/T = get_turf(src) + if (isturf(T)) + update_z(T.z) + +/mob/dead/Logout() + update_z(null) + return ..() + /mob/dead/forceMove(atom/destination) + var/turf/old_turf = get_turf(src) + var/turf/new_turf = get_turf(destination) + if (old_turf?.z != new_turf?.z) + onTransitZ(old_turf?.z, new_turf?.z) var/oldloc = loc loc = destination - Moved(oldloc, NONE, TRUE) \ No newline at end of file + Moved(oldloc, NONE, TRUE) + +/mob/dead/onTransitZ(old_z,new_z) + ..() + update_z(new_z) + +/mob/dead/proc/update_z(new_z) // 1+ to register, null to unregister + if (registered_z != new_z) + if (registered_z) + SSmobs.dead_players_by_zlevel[registered_z] -= src + if (client) + if (new_z) + SSmobs.dead_players_by_zlevel[new_z] += src + registered_z = new_z + else + registered_z = null \ No newline at end of file From 4ff9f25e5e76240af58b1911db8f69b173656300 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Fri, 24 May 2019 00:53:02 +0200 Subject: [PATCH 18/30] initial commit --- code/game/gamemodes/changeling/evolution_menu.dm | 6 ++++++ code/modules/mob/living/login.dm | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index e8d266d2dd5..13f19bcce30 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -422,3 +422,9 @@ var/list/sting_paths if(power.name == P.name) return 1 return 0 + +/datum/changeling/proc/regain_powers() //for when action buttons are lost and need to be regained, such as when the mind enters a new mob + for(var/power in purchasedpowers) + var/datum/action/changeling/S = power + if(istype(S) && S.needs_button) + S.Grant(src) diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index d8e27df91fe..401136997e0 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -18,6 +18,10 @@ if(ranged_ability) ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!") + var/datum/changeling/changeling = mind.has_antag_datum(/datum/changeling) + if(changeling) + changeling.regain_powers() + //Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways. update_pipe_vision() From 0a6768958233ebb83cd76fe15de10117472c338d Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Fri, 24 May 2019 03:40:19 +0200 Subject: [PATCH 19/30] the actual fix --- code/game/gamemodes/changeling/evolution_menu.dm | 6 ------ code/modules/mob/living/login.dm | 8 ++++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index 13f19bcce30..e8d266d2dd5 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -422,9 +422,3 @@ var/list/sting_paths if(power.name == P.name) return 1 return 0 - -/datum/changeling/proc/regain_powers() //for when action buttons are lost and need to be regained, such as when the mind enters a new mob - for(var/power in purchasedpowers) - var/datum/action/changeling/S = power - if(istype(S) && S.needs_button) - S.Grant(src) diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index 401136997e0..580996e54d9 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -18,9 +18,13 @@ if(ranged_ability) ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!") - var/datum/changeling/changeling = mind.has_antag_datum(/datum/changeling) + //for when action buttons are lost and need to be regained, such as when the mind enters a new mob + var/datum/changeling/changeling = usr.mind.changeling if(changeling) - changeling.regain_powers() + for(var/power in changeling.purchasedpowers) + var/datum/action/changeling/S = power + if(istype(S) && S.needs_button) + S.Grant(src) //Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways. update_pipe_vision() From c55888ac9422bc4fec50a8b2210c5e5f8d59c016 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Fri, 24 May 2019 14:41:27 +0200 Subject: [PATCH 20/30] fixes the root cause --- .../gamemodes/changeling/evolution_menu.dm | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index e8d266d2dd5..b6a0213f82f 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -18,7 +18,6 @@ var/list/sting_paths var/dat = create_menu(changeling) usr << browse(dat, "window=powers;size=600x700")//900x480 - /datum/action/changeling/evolution_menu/proc/create_menu(var/datum/changeling/changeling) var/dat dat +="Changeling Evolution Menu" @@ -298,12 +297,10 @@ var/list/sting_paths ///// /datum/changeling/proc/purchasePower(var/mob/living/carbon/user, var/sting_name) - var/datum/action/changeling/thepower = null + var/list/all_powers = init_subtypes(/datum/action/changeling) - if(!sting_paths) - sting_paths = init_subtypes(/datum/action/changeling) - for(var/datum/action/changeling/cling_sting in sting_paths) + for(var/datum/action/changeling/cling_sting in all_powers) if(cling_sting.name == sting_name) thepower = cling_sting @@ -344,21 +341,19 @@ var/list/sting_paths to_chat(user, "We have removed our evolutions from this form, and are now ready to readapt.") user.remove_changeling_powers(1) canrespec = 0 - user.make_changeling() + user.make_changeling(FALSE) return 1 else to_chat(user, "You lack the power to readapt your evolutions!") return 0 -/mob/proc/make_changeling() +/mob/proc/make_changeling(var/get_free_powers = TRUE) if(!mind) return if(!ishuman(src)) return if(!mind.changeling) mind.changeling = new /datum/changeling(gender) - if(!sting_paths) - sting_paths = init_subtypes(/datum/action/changeling) if(mind.changeling.purchasedpowers) remove_changeling_powers(1) @@ -367,13 +362,23 @@ var/list/sting_paths for(var/language in languages) mind.changeling.absorbed_languages |= language - // purchase free powers. - for(var/datum/action/changeling/path in sting_paths) - //var/datum/action/changeling/S = new path() - if(!path.dna_cost) - if(!mind.changeling.has_sting(path)) - mind.changeling.purchasedpowers += path - path.on_purchase(src) + if(get_free_powers) + var/list/all_powers = init_subtypes(/datum/action/changeling) + for(var/datum/action/changeling/path in all_powers) // purchase free powers. + if(!path.dna_cost) + if(!mind.changeling.has_sting(path)) + mind.changeling.purchasedpowers += path + path.on_purchase(src) + else //for respec + var/datum/action/changeling/hivemind_upload/S1 = new + if(!mind.changeling.has_sting(S1)) + mind.changeling.purchasedpowers+=S1 + S1.Grant(src) + + var/datum/action/changeling/hivemind_download/S2 = new + if(!mind.changeling.has_sting(S2)) + mind.changeling.purchasedpowers+=S2 + S2.Grant(src) var/mob/living/carbon/C = src //only carbons have dna now, so we have to typecaste mind.changeling.absorbed_dna |= C.dna.Clone() From 21d2ea0723ed9b902761d9079ffa8c5498cb9c6a Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 25 May 2019 00:27:57 -0400 Subject: [PATCH 21/30] Automatic changelog generation for PR #11585 [ci skip] --- html/changelogs/AutoChangeLog-pr-11585.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11585.yml diff --git a/html/changelogs/AutoChangeLog-pr-11585.yml b/html/changelogs/AutoChangeLog-pr-11585.yml new file mode 100644 index 00000000000..053b6deb819 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11585.yml @@ -0,0 +1,5 @@ +author: "Arkatos" +delete-after: True +changes: + - bugfix: "Changelings should now correctly receive their action buttons" + - bugfix: "Changelings now do not steal action buttons from other changelings" From 910fd32154abedb094cd3ecf1c00c62cbc190fe6 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 25 May 2019 09:00:56 -0400 Subject: [PATCH 22/30] Automatic changelog generation for PR #11444 [ci skip] --- html/changelogs/AutoChangeLog-pr-11444.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11444.yml diff --git a/html/changelogs/AutoChangeLog-pr-11444.yml b/html/changelogs/AutoChangeLog-pr-11444.yml new file mode 100644 index 00000000000..08ad07a902d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11444.yml @@ -0,0 +1,4 @@ +author: "Kyep" +delete-after: True +changes: + - bugfix: "unanchored vending machines will no longer generate a runtime error when throwing products at people." From 7d74ae7392f184c7174c611fe91cef2c908f8f67 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 25 May 2019 09:01:20 -0400 Subject: [PATCH 23/30] Automatic changelog generation for PR #11465 [ci skip] --- html/changelogs/AutoChangeLog-pr-11465.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11465.yml diff --git a/html/changelogs/AutoChangeLog-pr-11465.yml b/html/changelogs/AutoChangeLog-pr-11465.yml new file mode 100644 index 00000000000..a38d2a20e15 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11465.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Can't use cuffs now while you have antidrop" From b138ef11f5458c350e060d3d318c2f7a418eb42d Mon Sep 17 00:00:00 2001 From: Couls Date: Sun, 26 May 2019 22:00:26 -0400 Subject: [PATCH 24/30] Update mouse.dm player-controlled mice no longer randomly go unconscious --- code/modules/mob/living/simple_animal/friendly/mouse.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 3b9b2d720ca..4faa821701c 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -57,7 +57,7 @@ /mob/living/simple_animal/mouse/Life() ..() - if(prob(0.5)) + if(prob(0.5) && !ckey) stat = UNCONSCIOUS icon_state = "mouse_[mouse_color]_sleep" wander = 0 @@ -220,4 +220,4 @@ response_harm = "stamps on" gold_core_spawnable = CHEM_MOB_SPAWN_INVALID can_collar = 0 - butcher_results = list(/obj/item/stack/sheet/metal = 1) \ No newline at end of file + butcher_results = list(/obj/item/stack/sheet/metal = 1) From 83a71343967d0a50d044754166bad8f6c4c049e9 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 27 May 2019 06:15:57 -0400 Subject: [PATCH 25/30] Automatic changelog generation for PR #11553 [ci skip] --- html/changelogs/AutoChangeLog-pr-11553.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11553.yml diff --git a/html/changelogs/AutoChangeLog-pr-11553.yml b/html/changelogs/AutoChangeLog-pr-11553.yml new file mode 100644 index 00000000000..9954dccfd28 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11553.yml @@ -0,0 +1,4 @@ +author: "Ty-Omaha" +delete-after: True +changes: + - tweak: "Changed admin take ticket color from neon green to Asay pink" From ab7444923b7c3ea88602eb3faafdd2e8fa64879b Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 27 May 2019 07:45:53 -0400 Subject: [PATCH 26/30] Automatic changelog generation for PR #11524 [ci skip] --- html/changelogs/AutoChangeLog-pr-11524.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11524.yml diff --git a/html/changelogs/AutoChangeLog-pr-11524.yml b/html/changelogs/AutoChangeLog-pr-11524.yml new file mode 100644 index 00000000000..e1036ef70a7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11524.yml @@ -0,0 +1,4 @@ +author: "Fox McCloud" +delete-after: True +changes: + - rscdel: "Removes the Process Scheduler" From 4eb49c2224cecb1412cad6cba0593b00ac614789 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 27 May 2019 07:49:54 -0400 Subject: [PATCH 27/30] Automatic changelog generation for PR #11537 [ci skip] --- html/changelogs/AutoChangeLog-pr-11537.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11537.yml diff --git a/html/changelogs/AutoChangeLog-pr-11537.yml b/html/changelogs/AutoChangeLog-pr-11537.yml new file mode 100644 index 00000000000..304766c2b8d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11537.yml @@ -0,0 +1,4 @@ +author: "Akatos" +delete-after: True +changes: + - tweak: "Smartfridges now visually show approximate number of items inside" From c2a339e431d4e01e7b9c43cc1429f898c4ffedf8 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 27 May 2019 22:53:19 -0400 Subject: [PATCH 28/30] Automatic changelog generation for PR #11466 [ci skip] --- html/changelogs/AutoChangeLog-pr-11466.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11466.yml diff --git a/html/changelogs/AutoChangeLog-pr-11466.yml b/html/changelogs/AutoChangeLog-pr-11466.yml new file mode 100644 index 00000000000..0cf1c132b42 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11466.yml @@ -0,0 +1,4 @@ +author: "Markolie" +delete-after: True +changes: + - bugfix: "Chameleon items now use the appropriate species icon." From 8631f5424612a30902358d84483d1cc2db42ee37 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 27 May 2019 23:28:36 -0400 Subject: [PATCH 29/30] Automatic changelog generation for PR #11584 [ci skip] --- html/changelogs/AutoChangeLog-pr-11584.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11584.yml diff --git a/html/changelogs/AutoChangeLog-pr-11584.yml b/html/changelogs/AutoChangeLog-pr-11584.yml new file mode 100644 index 00000000000..83db80c473f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11584.yml @@ -0,0 +1,4 @@ +author: "Markolie" +delete-after: True +changes: + - bugfix: "Ghosts can now transition through space again. This is now done by clicking on the edge of space." From 7d940885b9fbe144e596d9d58ae8f0928021af12 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 28 May 2019 07:19:05 -0400 Subject: [PATCH 30/30] Automatic changelog generation for PR #11529 [ci skip] --- html/changelogs/AutoChangeLog-pr-11529.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11529.yml diff --git a/html/changelogs/AutoChangeLog-pr-11529.yml b/html/changelogs/AutoChangeLog-pr-11529.yml new file mode 100644 index 00000000000..6de125cb71f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11529.yml @@ -0,0 +1,4 @@ +author: "Citinited" +delete-after: True +changes: + - tweak: "The button to close radial menus is much more obvious and easily-clickable now"