diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
index d518df47dc6e..3b21c3271764 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -894,7 +894,7 @@
/area/ruin/unpowered/corprejectrooms)
"vP" = (
/obj/structure/bed,
-/obj/item/bedsheet/cult,
+/obj/item/bedsheet/dorms,
/turf/open/floor/carpet/lone,
/area/ruin/unpowered/corprejectrooms)
"wl" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index 24dd5b6c31d7..98397324244f 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -70,7 +70,10 @@
/area/overmap_encounter/planetoid/cave/explored)
"hD" = (
/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor/engine/cult,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
/area/ruin/powered)
"hI" = (
/obj/item/reagent_containers/food/drinks/beer,
@@ -128,12 +131,17 @@
/area/overmap_encounter/planetoid/cave/explored)
"mi" = (
/obj/effect/decal/remains/human,
-/mob/living/simple_animal/hostile/construct/juggernaut/hostile{
- health = 450;
- maxHealth = 450;
- name = "Right Hand of the Elder"
+/obj/item/flashlight/lamp/green{
+ pixel_y = 12;
+ pixel_x = 8
+ },
+/obj/item/cigbutt/cigarbutt{
+ pixel_x = -7;
+ pixel_y = 8
},
-/turf/open/floor/engine/cult,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
/area/ruin/powered)
"mI" = (
/obj/structure/flora/ausbushes/fullgrass,
@@ -323,7 +331,7 @@
"AM" = (
/obj/effect/decal/cleanable/blood/gibs/down,
/obj/item/pickaxe,
-/turf/open/floor/engine/cult,
+/turf/open/floor/wood,
/area/ruin/powered)
"AN" = (
/obj/structure/closet/cabinet,
@@ -349,10 +357,11 @@
/turf/open/floor/carpet,
/area/ruin/powered)
"Cl" = (
-/obj/structure/sacrificealtar,
/obj/effect/decal/cleanable/blood/old,
-/obj/item/kitchen/knife/bloodletter,
-/turf/open/floor/engine/cult,
+/obj/structure/chair/comfy/brown,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
/area/ruin/powered)
"Dm" = (
/obj/structure/flora/grass/brown,
@@ -382,13 +391,12 @@
/area/overmap_encounter/planetoid/cave/explored)
"EF" = (
/obj/effect/decal/cleanable/blood/gibs/torso,
-/obj/effect/decal/remains/human,
-/mob/living/simple_animal/hostile/construct/juggernaut/hostile{
- health = 450;
- maxHealth = 450;
- name = "Left Hand of the Elder"
- },
-/turf/open/floor/engine/cult,
+/obj/structure/safe,
+/obj/item/ammo_box/a12g/slug,
+/obj/item/kitchen/knife/combat,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
/area/ruin/powered)
"FR" = (
/obj/effect/decal/cleanable/blood/splatter,
@@ -486,17 +494,9 @@
/area/ruin/powered)
"PQ" = (
/obj/effect/decal/cleanable/blood/splatter,
-/mob/living/simple_animal/hostile/illusion{
- deathmessage = "disperses into the air in a cloud of red mist, you feel slightly more at ease.";
- desc = "You can't quite make out what you're seeing.";
- faction = list("cult");
- health = 500;
- maxHealth = 500;
- melee_damage_lower = 10;
- melee_damage_upper = 30;
- name = "Village Elder"
- },
-/turf/open/floor/engine/cult,
+/mob/living/simple_animal/hostile/frontier/ranged/trooper,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
/area/ruin/powered)
"Qt" = (
/obj/effect/decal/cleanable/blood/footprints{
@@ -566,7 +566,7 @@
"WH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed,
-/obj/item/bedsheet/cult,
+/obj/item/bedsheet/dorms,
/turf/open/floor/wood,
/area/ruin/powered)
"Ze" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_demon.dmm b/_maps/RandomRuins/JungleRuins/jungle_demon.dmm
deleted file mode 100644
index 523c618d2244..000000000000
--- a/_maps/RandomRuins/JungleRuins/jungle_demon.dmm
+++ /dev/null
@@ -1,1186 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"bx" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"bE" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks/fullupgrade,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"bO" = (
-/obj/structure/closet/crate/secure/weapon,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"bR" = (
-/obj/structure/sign/poster/contraband/random,
-/turf/closed/wall,
-/area/ruin/powered)
-"cQ" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight/lamp/green,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"dt" = (
-/obj/effect/mob_spawn/human/corpse/assistant,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"dV" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"eO" = (
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"fm" = (
-/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"fr" = (
-/mob/living/simple_animal/hostile/cult_demon{
- health = 120;
- name = "Demonic Foreman";
- resize = 1.25
- },
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"fv" = (
-/obj/structure/flora/junglebush/large,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"fL" = (
-/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/cult_demon,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"fX" = (
-/obj/effect/decal/cleanable/chem_pile,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"fY" = (
-/obj/structure/sign/poster/contraband/random,
-/turf/closed/wall/material,
-/area/ruin/powered)
-"gL" = (
-/obj/machinery/door/airlock/grunge,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"hc" = (
-/obj/machinery/vending/wardrobe/jani_wardrobe,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"hk" = (
-/obj/machinery/light/floor,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"iw" = (
-/obj/structure/table/reinforced,
-/obj/item/soap/syndie,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/item/reagent_containers/spray/cyborg_lube,
-/obj/item/reagent_containers/spray/cyborg_drying,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/floor,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"iB" = (
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"iC" = (
-/obj/structure/chair/office,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/remains/human,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"jd" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"jf" = (
-/obj/structure/closet/crate/coffin,
-/obj/machinery/light/floor,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"jB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/up,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"kb" = (
-/turf/closed/wall/material,
-/area/ruin/powered)
-"kf" = (
-/obj/structure/sign/warning/explosives,
-/turf/closed/wall,
-/area/ruin/powered)
-"kM" = (
-/obj/structure/closet/crate/trashcart,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/eight,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"li" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"mI" = (
-/obj/vehicle/ridden/atv{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"mY" = (
-/turf/template_noop,
-/area/template_noop)
-"nC" = (
-/obj/structure/fluff/fokoff_sign,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"nJ" = (
-/obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"nR" = (
-/mob/living/simple_animal/hostile/cult_demon,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"pm" = (
-/obj/structure/table/reinforced,
-/obj/item/paper,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"pE" = (
-/obj/structure/flora/tree/jungle/small,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"qD" = (
-/obj/structure/fence{
- dir = 8
- },
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"qE" = (
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"rc" = (
-/obj/structure/closet/crate/grave/loot,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"rx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"rA" = (
-/obj/structure/chair/office,
-/obj/effect/mob_spawn/human/corpse/charredskeleton,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"se" = (
-/obj/structure/janitorialcart,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"sD" = (
-/obj/vehicle/ridden/atv{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"sK" = (
-/obj/structure/chair/office/light{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"sQ" = (
-/obj/effect/decal/cleanable/oil/slippery,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"tv" = (
-/obj/structure/chair/office,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/remains/human,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"tR" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/item/clothing/under/syndicate,
-/obj/structure/closet/syndicate{
- desc = "It's a basic storage unit.";
- name = "uniform closet"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/item/clothing/head/helmet/operator,
-/obj/item/clothing/head/helmet/operator,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"uj" = (
-/obj/structure/closet/crate/silvercrate,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"uD" = (
-/obj/item/kirbyplants/random,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"wr" = (
-/obj/structure/rack,
-/obj/item/spacecash/bundle/c1000,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/fakeartefact,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"wG" = (
-/obj/structure/rack,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/fakeartefact,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"wP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"wQ" = (
-/obj/structure/table/reinforced,
-/obj/item/phone,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"wS" = (
-/obj/structure/flora/tree/jungle,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"xe" = (
-/mob/living/simple_animal/hostile/cult_demon,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"xK" = (
-/obj/structure/bonfire/prelit,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"xY" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"yM" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"AB" = (
-/obj/machinery/door/airlock/grunge{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"AF" = (
-/obj/vehicle/ridden/wheelchair,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"AI" = (
-/obj/structure/flora/grass/jungle,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"AU" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/drinkingglasses,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Da" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Dd" = (
-/obj/effect/decal/remains/human,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"DC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Ed" = (
-/turf/closed/wall,
-/area/ruin/powered)
-"Ew" = (
-/obj/structure/flora/junglebush/c,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"EY" = (
-/turf/closed/wall/rust,
-/area/ruin/powered)
-"Fh" = (
-/obj/machinery/vending/cola/red,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"FA" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"FK" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"FR" = (
-/obj/structure/sign/warning/fire,
-/turf/closed/wall/material,
-/area/ruin/powered)
-"FY" = (
-/obj/structure/sign/warning/biohazard,
-/turf/closed/wall/rust,
-/area/ruin/powered)
-"GI" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/costume,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Hk" = (
-/obj/machinery/vending/donksofttoyvendor,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Hv" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Hz" = (
-/obj/machinery/door/airlock/grunge,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Ig" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/vehicle/ridden/wheelchair/motorized,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Iq" = (
-/obj/structure/chair/comfy/brown,
-/mob/living/simple_animal/hostile/cult_demon/greater{
- health = 250;
- name = "The Boss";
- resize = 1.5
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Ir" = (
-/obj/structure/flora/junglebush/b,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Jx" = (
-/obj/structure/fence,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"JB" = (
-/obj/structure/fence{
- dir = 4
- },
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"JI" = (
-/obj/effect/mob_spawn/human/corpse/pirate,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"KA" = (
-/obj/structure/flora/junglebush,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"KV" = (
-/obj/machinery/light/floor,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Lh" = (
-/obj/structure/chair/office/light{
- dir = 4
- },
-/mob/living/simple_animal/hostile/cult_demon,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Lu" = (
-/obj/structure/sign/warning,
-/turf/closed/wall/rust,
-/area/ruin/powered)
-"LP" = (
-/mob/living/simple_animal/hostile/cult_demon,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"LV" = (
-/obj/structure/flora/rock/jungle,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"LW" = (
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Mk" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Mq" = (
-/obj/structure/table/reinforced,
-/obj/item/pen/survival,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/key,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Mw" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/costume,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"MM" = (
-/obj/structure/chair/plastic{
- dir = 1
- },
-/obj/effect/decal/cleanable/ash/large,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"MW" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/material,
-/area/ruin/powered)
-"Nl" = (
-/obj/structure/sign/poster/contraband/random,
-/turf/closed/wall/rust,
-/area/ruin/powered)
-"Nm" = (
-/obj/structure/tank_dispenser,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Nt" = (
-/obj/structure/tank_dispenser,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"NU" = (
-/obj/structure/ore_box,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"OU" = (
-/obj/effect/mob_spawn/human/corpse/cargo_tech,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Pe" = (
-/obj/effect/decal/cleanable/ash,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"PA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
-/obj/item/clothing/mask/gas/syndicate,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"QI" = (
-/obj/structure/rack,
-/obj/item/spacecash/bundle/c1000,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Re" = (
-/obj/structure/table/reinforced,
-/obj/item/photo/old,
-/obj/item/key,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"RX" = (
-/obj/structure/table/reinforced,
-/obj/item/modular_computer/laptop/preset/civilian,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Sg" = (
-/obj/machinery/door/airlock/grunge,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Sz" = (
-/obj/structure/closet/ammunitionlocker,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"SJ" = (
-/obj/structure/sign/warning/nosmoking,
-/turf/closed/wall,
-/area/ruin/powered)
-"SU" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"SV" = (
-/obj/structure/closet/crate/trashcart,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Ta" = (
-/obj/structure/closet/secure_closet/engineering_electrical,
-/obj/effect/decal/cleanable/greenglow,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Tp" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/gloves,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Tr" = (
-/obj/effect/decal/cleanable/ash,
-/obj/structure/bed/dogbed,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"TI" = (
-/obj/structure/sign/warning/electricshock,
-/turf/closed/wall,
-/area/ruin/powered)
-"TY" = (
-/obj/structure/closet/crate/internals,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"UH" = (
-/obj/structure/filingcabinet,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Vp" = (
-/obj/structure/filingcabinet,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"VO" = (
-/obj/structure/rack,
-/obj/machinery/light/floor,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/fakeartefact,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Wa" = (
-/obj/structure/ore_box,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Wi" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"XB" = (
-/obj/effect/decal/remains/xeno,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"XS" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"Yp" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-"YL" = (
-/obj/structure/flora/rock/jungle,
-/turf/open/floor/plating/dirt/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"YX" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered)
-
-(1,1,1) = {"
-mY
-mY
-mY
-mY
-NU
-AI
-iB
-iB
-eO
-eO
-Mk
-YL
-iB
-mY
-mY
-mY
-mY
-mY
-mY
-mY
-"}
-(2,1,1) = {"
-mY
-Ed
-Ed
-bR
-Ed
-Ed
-iB
-eO
-nC
-Dd
-Mk
-iB
-Ed
-Ed
-Ed
-Nl
-EY
-EY
-Ed
-mY
-"}
-(3,1,1) = {"
-mY
-Ed
-Da
-XS
-Lh
-EY
-Ew
-Mk
-sD
-eO
-eO
-iB
-Ed
-YX
-sQ
-LW
-XS
-LW
-Ed
-mY
-"}
-(4,1,1) = {"
-mY
-Ed
-nJ
-XS
-SU
-EY
-pE
-eO
-Mk
-eO
-eO
-Ir
-bR
-LW
-wG
-FA
-Mw
-qE
-bR
-iB
-"}
-(5,1,1) = {"
-mY
-Ed
-nJ
-LW
-sK
-EY
-iB
-eO
-Mk
-Mk
-eO
-eO
-Ed
-LW
-XS
-Ig
-xe
-LW
-Ed
-iB
-"}
-(6,1,1) = {"
-iB
-Ed
-PA
-KV
-Wi
-Lu
-eO
-eO
-eO
-Mk
-Mk
-eO
-Ed
-LW
-Tp
-VO
-GI
-XS
-Ed
-iB
-"}
-(7,1,1) = {"
-iB
-bR
-rx
-LW
-LW
-Hz
-eO
-eO
-eO
-eO
-Mk
-eO
-gL
-LW
-LW
-AF
-sQ
-XS
-Ed
-dt
-"}
-(8,1,1) = {"
-iB
-EY
-Fh
-Mq
-Hk
-Ed
-Mk
-Mk
-eO
-eO
-eO
-eO
-SJ
-LW
-wr
-GI
-QI
-XS
-Ed
-iB
-"}
-(9,1,1) = {"
-iB
-EY
-EY
-bR
-Ed
-Ed
-iB
-eO
-fr
-eO
-eO
-KA
-EY
-LW
-DC
-LW
-fL
-XS
-Nl
-iB
-"}
-(10,1,1) = {"
-iB
-AI
-iB
-JB
-rc
-iB
-fv
-XB
-xK
-eO
-eO
-iB
-Nl
-XS
-sQ
-fm
-LW
-LW
-Ed
-iB
-"}
-(11,1,1) = {"
-iB
-OU
-iB
-JB
-NU
-AI
-iB
-eO
-Mk
-Mk
-eO
-AI
-EY
-Nt
-xY
-Yp
-xY
-Nm
-Ed
-iB
-"}
-(12,1,1) = {"
-iB
-iB
-iB
-JB
-wS
-iB
-iB
-iB
-eO
-Mk
-eO
-eO
-EY
-Ed
-Ed
-bR
-Ed
-Ed
-Ed
-iB
-"}
-(13,1,1) = {"
-iB
-iB
-AI
-qD
-iB
-iB
-YL
-iB
-eO
-eO
-eO
-Dd
-eO
-iB
-iB
-iB
-JB
-AI
-rc
-iB
-"}
-(14,1,1) = {"
-iB
-iB
-Ir
-JB
-iB
-iB
-iB
-iB
-iB
-eO
-eO
-eO
-Mk
-eO
-iB
-fv
-JB
-iB
-Ir
-iB
-"}
-(15,1,1) = {"
-iB
-Ed
-Ed
-Ed
-Ed
-EY
-EY
-EY
-AB
-kb
-Ed
-Ed
-Mk
-Mk
-eO
-Ed
-Ed
-Ed
-EY
-iB
-"}
-(16,1,1) = {"
-iB
-Ed
-Vp
-FK
-XS
-Tr
-EY
-Wi
-LW
-XS
-Re
-Ed
-eO
-Mk
-eO
-TI
-LP
-uj
-Nl
-iB
-"}
-(17,1,1) = {"
-iB
-Ed
-Hv
-XS
-cQ
-LW
-kb
-DC
-LW
-iC
-RX
-Ed
-SV
-eO
-eO
-Sg
-wP
-bO
-EY
-iB
-"}
-(18,1,1) = {"
-iB
-Ed
-bE
-Iq
-pm
-MM
-kb
-LW
-hk
-fY
-kb
-Ed
-eO
-eO
-eO
-gL
-LW
-TY
-EY
-iB
-"}
-(19,1,1) = {"
-iB
-Ed
-AU
-li
-yM
-XS
-FR
-XS
-LW
-fX
-wQ
-Ed
-mI
-eO
-iB
-kf
-LW
-jf
-Ed
-iB
-"}
-(20,1,1) = {"
-iB
-Ed
-UH
-LW
-Pe
-LW
-gL
-LW
-LW
-rA
-RX
-Ed
-Mk
-eO
-iB
-Ed
-XS
-Sz
-Ed
-iB
-"}
-(21,1,1) = {"
-mY
-Ed
-MW
-kb
-fY
-kb
-kb
-Wi
-hk
-Nl
-EY
-EY
-LV
-fv
-iB
-Ed
-XS
-tR
-Ed
-iB
-"}
-(22,1,1) = {"
-mY
-EY
-hc
-jB
-DC
-XS
-Sg
-XS
-qE
-XS
-jd
-EY
-eO
-iB
-AI
-bR
-nR
-Ta
-Ed
-mY
-"}
-(23,1,1) = {"
-mY
-EY
-bx
-kM
-se
-iw
-FY
-uD
-XS
-tv
-RX
-Ed
-Jx
-Jx
-Jx
-Ed
-dV
-Wa
-Ed
-mY
-"}
-(24,1,1) = {"
-mY
-EY
-EY
-EY
-Ed
-Ed
-EY
-Ed
-Ed
-Ed
-Ed
-Ed
-AI
-pE
-rc
-Ed
-Ed
-bR
-Ed
-mY
-"}
-(25,1,1) = {"
-mY
-mY
-mY
-mY
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-eO
-eO
-JI
-iB
-iB
-mY
-mY
-mY
-"}
diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
index 5aff7b4501b5..cda541385b56 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -165,7 +165,7 @@
/turf/open/floor/mineral/plastitanium/red/brig,
/area/overmap_encounter/planetoid/cave/explored)
"bh" = (
-/obj/item/clothing/under/rank/civilian/cookjorts,
+/obj/item/clothing/under/shorts/cookjorts,
/turf/closed/mineral/random/jungle,
/area/overmap_encounter/planetoid/cave/explored)
"bj" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm b/_maps/RandomRuins/JungleRuins/jungle_witch.dmm
deleted file mode 100644
index 70080ddae51b..000000000000
--- a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm
+++ /dev/null
@@ -1,583 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"bi" = (
-/obj/item/slimepotion/lovepotion{
- pixel_x = -5;
- pixel_y = 4
- },
-/obj/item/slimepotion/slime/sentience{
- pixel_x = 4;
- pixel_y = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/magic/wand/nothing,
-/obj/structure/table/wood/fancy,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"cl" = (
-/obj/structure/table/wood,
-/obj/item/toy/cards/deck/tarot,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"cp" = (
-/obj/effect/decal/cleanable/blood/gibs,
-/obj/item/toy/plush/among{
- desc = "He seems to practice the ManSus..."
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"el" = (
-/obj/structure/flora/junglebush,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"ev" = (
-/obj/structure/table/wood/fancy/cyan,
-/obj/machinery/microwave{
- desc = "It's a fucking microwave. How is this even powered?";
- name = "Wizardly Cooking Apparatus"
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"gf" = (
-/obj/structure/table/wood/fancy/cyan,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
-/obj/item/reagent_containers/food/snacks/chococoin{
- pixel_x = 6;
- pixel_y = 5
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"iS" = (
-/obj/machinery/door/airlock/wood,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"jh" = (
-/obj/item/toy/crayon/white,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"jF" = (
-/obj/item/restraints/legcuffs/beartrap/energy,
-/obj/machinery/door/airlock/wood,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"kc" = (
-/obj/machinery/door/airlock/wood{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"lG" = (
-/obj/item/storage/book/bible,
-/obj/structure/closet/crate/bin,
-/obj/item/soulstone/anybody/purified,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"lR" = (
-/obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat,
-/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat,
-/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"nV" = (
-/obj/item/bedsheet/black,
-/obj/structure/bed,
-/mob/living/simple_animal/hostile/dark_wizard,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/clothing/gloves/combat/wizard,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"nW" = (
-/obj/effect/decal/cleanable/blood/gibs/torso,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"oL" = (
-/obj/item/flashlight/lamp/bananalamp,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"qh" = (
-/obj/structure/table/wood,
-/obj/item/clothing/head/collectable/wizard,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"qM" = (
-/obj/structure/flora/ausbushes/brflowers,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"rr" = (
-/obj/structure/trap/fire,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"rM" = (
-/obj/structure/table/wood,
-/obj/item/fakeartefact,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"rS" = (
-/obj/structure/table/wood,
-/obj/item/toy/cards/deck/kotahi,
-/obj/item/coin/gold{
- pixel_x = 9;
- pixel_y = 8
- },
-/obj/item/coin/gold{
- pixel_x = -8;
- pixel_y = 7
- },
-/obj/item/coin/gold,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"se" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"sP" = (
-/obj/structure/flora/rock/jungle,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"sT" = (
-/obj/effect/decal/cleanable/crayon,
-/obj/item/shard{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/kitchen/knife,
-/obj/item/shard{
- pixel_x = 6;
- pixel_y = -8
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"tn" = (
-/obj/structure/table/wood,
-/obj/item/storage/crayons,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"tC" = (
-/obj/structure/trap/damage,
-/turf/open/floor/wood,
-/area/overmap_encounter/planetoid/jungle/explored)
-"tT" = (
-/obj/item/toy/plush/narplush,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"vf" = (
-/obj/structure/table/wood/fancy/cyan,
-/obj/item/reagent_containers/food/snacks/burger/spell,
-/obj/item/reagent_containers/food/snacks/dankpocket{
- pixel_x = 8;
- pixel_y = 10
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"wI" = (
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"wL" = (
-/obj/item/chair/wood,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"yj" = (
-/obj/structure/flora/tree/jungle,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"ym" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"zt" = (
-/obj/effect/decal/cleanable/food/pie_smudge,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"zZ" = (
-/obj/structure/flora/rock,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"AG" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Bj" = (
-/obj/effect/decal/cleanable/food/tomato_smudge,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"Cc" = (
-/obj/structure/flora/tree/jungle/small,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"CN" = (
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Dr" = (
-/obj/effect/decal/cleanable/generic,
-/obj/machinery/light/dim/directional/south,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"DP" = (
-/obj/item/chair/wood{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/gibs/core,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"Eq" = (
-/turf/closed/wall/mineral/wood,
-/area/ruin/powered)
-"ER" = (
-/obj/structure/trap/stun,
-/turf/open/floor/wood,
-/area/overmap_encounter/planetoid/jungle/explored)
-"EV" = (
-/obj/structure/barricade/wooden,
-/obj/structure/curtain/cloth/fancy,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"FG" = (
-/obj/structure/trap/chill,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Go" = (
-/mob/living/simple_animal/hostile/dark_wizard,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"Gx" = (
-/mob/living/simple_animal/pet/cat/Runtime{
- name = "Witches Familiar"
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"Kc" = (
-/turf/open/floor/wood,
-/area/ruin/powered)
-"KA" = (
-/obj/structure/flora/ausbushes/ywflowers,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"LK" = (
-/obj/structure/barricade/wooden/crude,
-/obj/structure/curtain/cloth/fancy,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"NP" = (
-/obj/effect/decal/cleanable/blood/gibs/up,
-/obj/item/clothing/head/helmet/chaplain,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Ps" = (
-/obj/item/chair/wood{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"Rp" = (
-/obj/effect/decal/cleanable/blood/gibs/down,
-/obj/item/clothing/suit/armor/riot/chaplain,
-/obj/item/claymore/weak,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"SZ" = (
-/obj/item/clothing/suit/armor/riot/chaplain/witchhunter,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
-/obj/item/claymore/weak,
-/obj/item/bodypart/head,
-/obj/effect/decal/cleanable/blood/gibs/bubblegum,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Uy" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/dim/directional/west,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"WI" = (
-/obj/structure/mineral_door/wood,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"Xl" = (
-/obj/structure/flora/ausbushes/ppflowers,
-/turf/open/floor/plating/dirt/jungle/dark/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"YG" = (
-/obj/item/clothing/suit/wizrobe/marisa,
-/obj/item/clothing/head/wizard/marisa,
-/obj/item/clothing/shoes/sandal/marisa,
-/obj/structure/closet/cabinet,
-/obj/item/clothing/suit/space/hardsuit/wizard,
-/obj/item/staff/broom,
-/turf/open/floor/wood,
-/area/ruin/powered)
-"YZ" = (
-/turf/open/floor/wood,
-/area/overmap_encounter/planetoid/jungle/explored)
-"Zi" = (
-/obj/structure/table/wood,
-/obj/item/fakeartefact,
-/obj/item/scanner_wand{
- pixel_x = -16
- },
-/turf/open/floor/wood,
-/area/ruin/powered)
-"ZL" = (
-/obj/structure/trap/damage,
-/turf/open/water/jungle/lit,
-/area/overmap_encounter/planetoid/jungle/explored)
-"ZW" = (
-/obj/effect/mob_spawn/human/corpse,
-/turf/open/floor/wood,
-/area/ruin/powered)
-
-(1,1,1) = {"
-Xl
-el
-qM
-wI
-wI
-AG
-tC
-wI
-wI
-Cc
-wI
-NP
-Rp
-sP
-qM
-"}
-(2,1,1) = {"
-sP
-CN
-wI
-zZ
-wI
-YZ
-YZ
-wI
-wI
-wI
-wI
-wI
-wI
-el
-Xl
-"}
-(3,1,1) = {"
-CN
-Xl
-wI
-Eq
-Eq
-kc
-kc
-Eq
-Eq
-Eq
-Eq
-Eq
-wI
-wI
-yj
-"}
-(4,1,1) = {"
-el
-FG
-wI
-Eq
-lR
-ym
-Kc
-Kc
-Uy
-Go
-Kc
-Eq
-wI
-wI
-sP
-"}
-(5,1,1) = {"
-wI
-wI
-wI
-EV
-vf
-Kc
-Ps
-tn
-rM
-cl
-wL
-Eq
-zZ
-wI
-CN
-"}
-(6,1,1) = {"
-Cc
-wI
-wI
-EV
-gf
-Gx
-Kc
-rS
-Zi
-qh
-ym
-Eq
-wI
-wI
-wI
-"}
-(7,1,1) = {"
-wI
-wI
-wI
-Eq
-ev
-Kc
-se
-Kc
-Kc
-Kc
-Kc
-iS
-YZ
-ER
-YZ
-"}
-(8,1,1) = {"
-wI
-wI
-wI
-Eq
-Eq
-Eq
-Eq
-Bj
-DP
-jh
-Kc
-jF
-AG
-YZ
-KA
-"}
-(9,1,1) = {"
-ZL
-wI
-zZ
-Eq
-bi
-YG
-Eq
-Kc
-ZW
-sT
-Kc
-Eq
-wI
-wI
-el
-"}
-(10,1,1) = {"
-sP
-wI
-wI
-Eq
-tT
-ym
-WI
-Kc
-zt
-cp
-Dr
-Eq
-wI
-CN
-CN
-"}
-(11,1,1) = {"
-CN
-qM
-wI
-Eq
-nV
-oL
-Eq
-lG
-Kc
-Kc
-ym
-Eq
-zZ
-sP
-qM
-"}
-(12,1,1) = {"
-Xl
-CN
-wI
-Eq
-Eq
-Eq
-Eq
-Eq
-LK
-LK
-Eq
-Eq
-KA
-CN
-KA
-"}
-(13,1,1) = {"
-CN
-Xl
-wI
-wI
-wI
-wI
-wI
-wI
-SZ
-nW
-wI
-CN
-CN
-Xl
-CN
-"}
-(14,1,1) = {"
-yj
-CN
-CN
-wI
-Cc
-wI
-wI
-rr
-wI
-wI
-CN
-sP
-CN
-CN
-yj
-"}
-(15,1,1) = {"
-KA
-CN
-qM
-CN
-wI
-wI
-wI
-sP
-CN
-KA
-Xl
-qM
-Xl
-CN
-qM
-"}
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
index 8b39b0a6faa8..4f4464b57c7c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
@@ -50,7 +50,7 @@
"m" = (
/obj/structure/table,
/obj/item/soulstone/anybody,
-/obj/item/toy/plush/narplush,
+/obj/item/toy/plush/lizardplushie,
/obj/machinery/light/broken/directional/north,
/obj/structure/window/reinforced/spawner,
/obj/machinery/door/window/brigdoor/westright,
@@ -241,7 +241,6 @@
},
/obj/effect/mob_spawn/human/corpse/damaged,
/obj/item/clothing/under/rank/civilian/chaplain,
-/obj/item/clothing/suit/chaplainsuit/witchhunter,
/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/glass,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
deleted file mode 100644
index 0e10bd31f4e7..000000000000
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
+++ /dev/null
@@ -1,347 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/template_noop,
-/area/template_noop)
-"b" = (
-/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/overmap_encounter/planetoid/lava/explored)
-"c" = (
-/turf/open/lava/smooth/lava_land_surface,
-/area/overmap_encounter/planetoid/lava/explored)
-"d" = (
-/turf/closed/wall/mineral/cult,
-/area/overmap_encounter/planetoid/lava/explored)
-"e" = (
-/obj/effect/decal/remains/human,
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/overmap_encounter/planetoid/lava/explored)
-"f" = (
-/obj/structure/destructible/cult/pylon,
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/overmap_encounter/planetoid/lava/explored)
-"g" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/overmap_encounter/planetoid/lava/explored)
-"i" = (
-/obj/effect/decal/remains/human,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/overmap_encounter/planetoid/lava/explored)
-"k" = (
-/obj/effect/decal/remains/human,
-/obj/item/melee/cultblade,
-/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/overmap_encounter/planetoid/lava/explored)
-"l" = (
-/obj/effect/decal/remains/human,
-/obj/item/clothing/shoes/cult,
-/obj/item/clothing/suit/hooded/cultrobes,
-/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/overmap_encounter/planetoid/lava/explored)
-"m" = (
-/obj/effect/decal/remains/human,
-/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/overmap_encounter/planetoid/lava/explored)
-"o" = (
-/obj/effect/rune/narsie{
- color = "#ff0000";
- used = 1
- },
-/obj/item/cult_shift,
-/obj/effect/decal/remains/human,
-/obj/item/melee/cultblade/dagger,
-/obj/effect/step_trigger/sound_effect{
- happens_once = 1;
- name = "\proper a grave mistake";
- sound = 'sound/hallucinations/i_see_you1.ogg';
- triggerer_only = 1
- },
-/obj/effect/step_trigger/message{
- message = "You've made a grave mistake, haven't you? Copy No. 5441
+
+ Pan-Gezenan Federation
+ Universal Battleship Linear Weapon Mounts
+ Etherbor Lihmona Shipyards
+
+ The Universal Colossal Battleship Linear Weapon Mount or simply "Universal Linear Mount" (USM), is a linear rail system that can be commonly found in many ships created in the Etherbor Lihmona Shipyards. Attachment of a weapon to a Universal Linear Mount requires the use of a Linear Mount Tool Facility. An engineering marvel are the massive machines at these facilities that effortlessly handle these systems on a regular basis. Most shipyards dealing in Kalixcian Colossal Arms will also have such a facility to install the weapons.
+
+ The installation of weapons into a Universal Linear Mount is rather simplistic. A weapon must first be delivered to the Linear Mount Tool Facility, where it will be manually loaded onto the SMT's massive cargo lift. The SMT is then extended out around the weapon, and the weapon is then secured into the SMT with engaging locks. The next step is to bring the ship into the facility, placed just in line with the SMT. The weapon is then lined up with the Universal Linear Mount and slotted into place. The USM's hardware locks are then engaged, the weapon is welded to the USM, and electronic systems are hooked into the ship's computer systems. The weapons are then hooked into an independent power bank to prevent overdraw from main ship power banks, and prevent explosive backsurge.
+
+ Common Colossal Battleship Weapons compatible with the Universal Linear Mount include the following:
+
+ HORUS Colossal Energy Cannon
+
+ A massive laser cannon capable of variable strength, and sustained fire up to 10 seconds. One of the highest power draws of all colossal warship guns. Multiple independent power banks are required to fire this gun, with the lowest power setting drawing 4MW/s, and the highest drawing 16MW/s.
+
+ SUPERNOVA High-Performance Giant Rail Cannon
+
+ While not as powerful as the QUASAR SMITER Colossal Rail Cannon, this gun is one of the most commonly produced at the Lihmona Shipyards. Fires a 9/5ths meter "Huge Slug" ordinance, accelerated by 1MW draw pair of electromagnetic accelerators.
+
+ Massive Ordinance Missile Array (B.O.M.B)
+
+ A popular choice amongst bomber ships, the "Massive Ordinance Missile Array" or "M.O.M.A" for short, is a rapid fire missile array chain launcher. Capable of firing up to 4 missiles per second, these weapons often find their homes on ships with exceedingly large cargo bays built for holding large hoards of heavy ordinance.
+
+ QUASAR SMITER Colossal Rail Cannon
+
+ The largest gun ever produced by the Lihmona Shipyards, the QUASAR SMITER is a truly terrifying tool of destruction. A gun requiring 3 Universal Linear Mounts to hold, this gun finds its place only on the largest ships in the PGFN and PGFMC. This gun fires 18/5ths meter gigantic "DEMON SLUG"s at a rate of approximately 1 shot every 5 minutes. The power draw of such a massive weapon sings to the tun of 50MW of power per round.
+
+ "}
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index 444743c0403e..3722fcb09356 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -45,12 +45,6 @@
icon_state = "dk_yellow"
-//Cult Altar
-
-/area/ruin/unpowered/cultaltar
- name = "Cult Altar"
- ambientsounds = SPOOKY
-
//Xeno Nest
/area/ruin/unpowered/xenonest
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index be8e666b60a9..abf40f900af5 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -282,6 +282,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
lighting_colour_bulb = "#ffbc6f"
sound_environment = SOUND_AREA_LARGE_ENCLOSED
+/area/ship/engineering/engines
+ name = "Engines"
+
+/area/ship/engineering/engines/port
+ name = "Port Engines"
+
+/area/ship/engineering/engines/starboard
+ name = "Starboard Engines"
+
/area/ship/engineering/atmospherics
name = "Atmospherics"
icon_state = "atmos"
diff --git a/code/game/communications.dm b/code/game/communications.dm
index 90d561e304c7..94afdbf364f5 100644
--- a/code/game/communications.dm
+++ b/code/game/communications.dm
@@ -99,6 +99,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE,
RADIO_CHANNEL_NANOTRASEN = FREQ_NANOTRASEN,
RADIO_CHANNEL_MINUTEMEN = FREQ_MINUTEMEN,
+ RADIO_CHANNEL_PGF = FREQ_PGF,
RADIO_CHANNEL_INTEQ = FREQ_INTEQ,
RADIO_CHANNEL_PIRATE = FREQ_PIRATE,
RADIO_CHANNEL_AI_PRIVATE = FREQ_AI_PRIVATE,
@@ -115,6 +116,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE,
"[FREQ_NANOTRASEN]" = RADIO_CHANNEL_NANOTRASEN,
"[FREQ_MINUTEMEN]" = RADIO_CHANNEL_MINUTEMEN,
+ "[FREQ_PGF]" = RADIO_CHANNEL_PGF,
"[FREQ_INTEQ]" = RADIO_CHANNEL_INTEQ,
"[FREQ_PIRATE]" = RADIO_CHANNEL_PIRATE,
"[FREQ_AI_PRIVATE]" = RADIO_CHANNEL_AI_PRIVATE,
diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm
index 1f80c6a9c3ce..2e93cd179ed5 100644
--- a/code/game/machinery/bank_machine.dm
+++ b/code/game/machinery/bank_machine.dm
@@ -8,6 +8,7 @@
var/siphoning = FALSE
var/next_warning = 0
var/obj/item/radio/radio
+ var/datum/weakref/ship_account_ref
var/radio_channel = RADIO_CHANNEL_COMMON
var/minimum_time_between_warnings = 400
var/syphoning_credits = 0
@@ -19,23 +20,21 @@
radio.canhear_range = 0
radio.recalculateChannels()
+/obj/machinery/computer/bank_machine/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ . = ..()
+ ship_account_ref = WEAKREF(port.current_ship.ship_account)
+
/obj/machinery/computer/bank_machine/Destroy()
QDEL_NULL(radio)
. = ..()
/obj/machinery/computer/bank_machine/attackby(obj/item/I, mob/user)
- var/value = 0
- if(istype(I, /obj/item/spacecash/bundle))
- var/obj/item/spacecash/bundle/C = I
- value = C.value
- else if(istype(I, /obj/item/holochip))
- var/obj/item/holochip/H = I
- value = H.credits
+ var/value = I.get_item_credit_value()
if(value)
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(D)
- D.adjust_money(value)
- to_chat(user, "You deposit [I]. The Cargo Budget is now [D.account_balance] cr. ")
+ var/datum/bank_account/ship_account = ship_account_ref.resolve()
+ if(ship_account)
+ ship_account.adjust_money(value, "deposit")
+ to_chat(user, "You deposit [I]. The [ship_account.account_holder] Budget is now [ship_account.account_balance] cr. ")
qdel(I)
return
return ..()
@@ -46,15 +45,15 @@
if (machine_stat & (BROKEN|NOPOWER))
say("Insufficient power. Halting siphon.")
end_syphon()
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(!D.has_money(200))
- say("Cargo budget depleted. Halting siphon.")
+ var/datum/bank_account/ship_account = ship_account_ref.resolve()
+ if(!ship_account?.has_money(200))
+ say("Ship budget depleted. Halting siphon.")
end_syphon()
return
playsound(src, 'sound/items/poster_being_created.ogg', 100, TRUE)
syphoning_credits += 200
- D.adjust_money(-200)
+ ship_account.adjust_money(-200)
if(next_warning < world.time && prob(15))
var/area/A = get_area(loc)
var/message = "Unauthorized credit withdrawal underway in [initial(A.name)]!!"
@@ -69,14 +68,13 @@
/obj/machinery/computer/bank_machine/ui_data(mob/user)
var/list/data = list()
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
-
- if(D)
- data["current_balance"] = D.account_balance
+ var/datum/bank_account/ship_account = ship_account_ref.resolve()
+ if(ship_account)
+ data["current_balance"] = ship_account.account_balance
else
data["current_balance"] = 0
data["siphoning"] = siphoning
- data["station_name"] = station_name()
+ data["ship_name"] = ship_account.account_holder
return data
@@ -87,11 +85,11 @@
switch(action)
if("siphon")
- say("Siphon of company credits has begun!")
+ say("Siphon of ship credits has begun!")
siphoning = TRUE
. = TRUE
if("halt")
- say("Company credit withdrawal halted.")
+ say("Ship credit withdrawal halted.")
end_syphon()
. = TRUE
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 2f8e066a74ba..63f9284c28ae 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -419,8 +419,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
to_chat(usr, "No log exists for this job. ")
updateUsrDialog()
return
- if(inserted_modify_id.registered_account)
- inserted_modify_id.registered_account.account_job = jobdatum // this is a terrible idea and people will grief but sure whatever
inserted_modify_id.access = (istype(src, /obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access())
if (inserted_modify_id)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 2dc9a2c98bed..37759d04b13e 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -190,35 +190,9 @@
if((istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2)))
dat += "Security Data [active2.fields["criminal"]] "
- dat += "Add New "
-
- dat +={"
-
- Crime
- Fine
- Author
- Time Added
- Amount Due
- Del
- "}
- for(var/datum/data/crime/c in active2.fields["citation"])
- var/owed = c.fine - c.paid
- dat += {"[c.crimeName]
- [c.fine] cr [c.author]
- [c.time] "}
- if(owed > 0)
- dat += "[owed] cr \[Pay\] "
- else
- dat += "All Paid Off "
- dat += {"
- \[X\]
-
-
"
dat += "Add New "
-
dat +={"
Crime
@@ -347,26 +321,6 @@ What a mess.*/
active2 = E
screen = 3
- if("Pay")
- for(var/datum/data/crime/p in active2.fields["citation"])
- if(p.dataId == text2num(href_list["cdataid"]))
- var/obj/item/holochip/C = usr.is_holding_item_of_type(/obj/item/holochip)
- if(C && istype(C))
- var/pay = C.get_item_credit_value()
- if(!pay)
- to_chat(usr, "[C] doesn't seem to be worth anything! ")
- else
- var/diff = p.fine - p.paid
- GLOB.data_core.payCitation(active2.fields["id"], text2num(href_list["cdataid"]), pay)
- to_chat(usr, "You have paid [pay] credit\s towards your fine. ")
- if (pay == diff || pay > diff || pay >= diff)
- investigate_log("Citation Paid off: [p.crimeName] Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS)
- to_chat(usr, "The fine has been paid in full. ")
- qdel(C)
- playsound(src, "terminal_type", 25, FALSE)
- else
- to_chat(usr, "Fines can only be paid with holochips! ")
-
if("Print Record")
if(!(printing))
printing = 1
@@ -677,45 +631,6 @@ What a mess.*/
return
GLOB.data_core.addCrimeDetails(active1.fields["id"], href_list["cdataid"], t1)
investigate_log("New Crime details: [t1] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS)
- if("citation_add")
- if(istype(active1, /datum/data/record))
- var/maxFine = CONFIG_GET(number/maxfine)
-
- var/t1 = stripped_input(usr, "Please input citation crime:", "Secure. records", "", null)
- var/fine = FLOOR(input(usr, "Please input citation fine, up to [maxFine]:", "Secure. records", 50) as num|null, 1)
-
- if (isnull(fine))
- return
- fine = min(fine, maxFine)
-
- if(fine < 0)
- to_chat(usr, "You're pretty sure that's not how money works. ")
- return
-
- if(!canUseSecurityRecordsConsole(usr, t1, null, a2))
- return
-
- var/crime = GLOB.data_core.createCrimeEntry(t1, "", authenticated, station_time_timestamp(), fine)
- for (var/obj/item/pda/P in GLOB.PDAs)
- if(P.owner == active1.fields["name"])
- var/message = "You have been fined [fine] credits for '[t1]'. Fines may be paid at security."
- var/datum/signal/subspace/messaging/pda/signal = new(src, list(
- "name" = "Security Citation",
- "job" = "Citation Server",
- "message" = message,
- "targets" = list("[P.owner] ([P.ownjob])"),
- "automated" = 1
- ))
- signal.send_to_receivers()
- usr.log_message("(PDA: Citation Server) sent \"[message]\" to [signal.format_target()]", LOG_PDA)
- GLOB.data_core.addCitation(active1.fields["id"], crime)
- investigate_log("New Citation: [t1] Fine: [fine] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS)
- if("citation_delete")
- if(istype(active1, /datum/data/record))
- if(href_list["cdataid"])
- if(!canUseSecurityRecordsConsole(usr, "delete", null, a2))
- return
- GLOB.data_core.removeCitation(active1.fields["id"], href_list["cdataid"])
if("notes")
if(istype(active2, /datum/data/record))
var/t1 = stripped_input(usr, "Please summarize notes:", "Secure. records", active2.fields["notes"], null)
diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm
index 5c48d07f6d79..a5b72e1aae40 100644
--- a/code/game/machinery/computer/warrant.dm
+++ b/code/game/machinery/computer/warrant.dm
@@ -41,31 +41,6 @@
[current.fields["criminal"]][notice]
"}
- dat += "
-
- Crime
- Fine
- Author
- Time Added
- Amount Due
- Make Payment
- "}
- for(var/datum/data/crime/c in current.fields["citation"])
- var/owed = c.fine - c.paid
- dat += {"[c.crimeName]
- [c.fine] cr
- [c.author]
- [c.time] "}
- if(owed > 0)
- dat += {"[owed] cr
- \[Pay\] All Paid Off "
- dat += "
"
-
dat += "
@@ -108,24 +83,5 @@
authenticated = null
playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
- if("Pay")
- for(var/datum/data/crime/p in current.fields["citation"])
- if(p.dataId == text2num(href_list["cdataid"]))
- var/obj/item/holochip/C = M.is_holding_item_of_type(/obj/item/holochip)
- if(C && istype(C))
- var/pay = C.get_item_credit_value()
- if(!pay)
- to_chat(M, "[C] doesn't seem to be worth anything! ")
- else
- var/diff = p.fine - p.paid
- GLOB.data_core.payCitation(current.fields["id"], text2num(href_list["cdataid"]), pay)
- to_chat(M, "You have paid [pay] credit\s towards your fine. ")
- if (pay == diff || pay > diff || pay >= diff)
- investigate_log("Citation Paid off: [p.crimeName] Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS)
- to_chat(M, "The fine has been paid in full. ")
- qdel(C)
- playsound(src, "terminal_type", 25, FALSE)
- else
- to_chat(M, "Fines can only be paid with holochips! ")
updateUsrDialog()
add_fingerprint(M)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 8dbc880f740a..eb23f1060be3 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -1,7 +1,7 @@
/obj/machinery/door
name = "door"
desc = "It opens and closes."
- icon = 'icons/obj/doors/Doorint.dmi'
+ icon = 'icons/obj/doors/doorf.dmi'
icon_state = "door1"
base_icon_state = "door"
opacity = TRUE
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 0b538d1ce109..aa3e4ece65e9 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -233,11 +233,9 @@
var/old_tech_largest_bomb_value = linked_techweb.largest_bomb_value //held so we can pull old before we do math
linked_techweb.largest_bomb_value = point_gain
point_gain -= old_tech_largest_bomb_value
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_SCI)
- if(D)
- D.adjust_money(point_gain)
- linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, point_gain)
- say("Explosion details and mixture analyzed and sold to the highest bidder for [point_gain] cr, with a reward of [point_gain] points.")
+ new /obj/item/spacecash(get_dumping_location(), point_gain)
+ linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, point_gain)
+ say("Explosion details and mixture analyzed and sold to the highest bidder for [point_gain] cr, with a reward of [point_gain] points.")
else //you've made smaller bombs
say("Data already captured. Aborting.")
diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm
index d54bc3c476af..dbf055d98079 100644
--- a/code/game/machinery/droneDispenser.dm
+++ b/code/game/machinery/droneDispenser.dm
@@ -109,12 +109,12 @@
/obj/machinery/droneDispenser/swarmer
name = "swarmer fabricator"
desc = "An alien machine of unknown origin. It whirs and hums with green-blue light, the air above it shimmering."
- icon = 'icons/obj/machines/gateway.dmi'
- icon_state = "toffcenter"
- icon_off = "toffcenter"
- icon_on = "toffcenter"
- icon_recharging = "toffcenter"
- icon_creating = "offcenter"
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "hivebot_fab"
+ icon_off = "hivebot_fab"
+ icon_on = "hivebot_fab"
+ icon_recharging = "hivebot_fab"
+ icon_creating = "hivebot_fab_on"
metal_cost = 0
glass_cost = 0
cooldownTime = 300 //30 seconds
diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm
index 79fb5e83bdf1..d7be7fea98ee 100644
--- a/code/game/machinery/medical_kiosk.dm
+++ b/code/game/machinery/medical_kiosk.dm
@@ -20,51 +20,19 @@
density = TRUE
circuit = /obj/item/circuitboard/machine/medical_kiosk
var/obj/item/scanner_wand
- var/default_price = 15 //I'm defaulting to a low price on this, but in the future I wouldn't have an issue making it more or less expensive.
- var/active_price = 15 //Change by using a multitool on the board.
- var/pandemonium = FALSE //AKA: Emag mode.
+ /// Emag mode
+ var/pandemonium = FALSE
/// Shows whether the kiosk is being used to scan someone and what it's being used for.
var/scan_active = NONE
- /// Do we have someone paying to use this?
- var/paying_customer = FALSE //Ticked yes if passing inuse()
-
- var/datum/bank_account/account //payer's account.
- var/mob/living/carbon/human/H //The person using the console in each instance. Used for paying for the kiosk.
- var/mob/living/carbon/human/altPatient //If scanning someone else, this will be the target.
- var/obj/item/card/id/C //the account of the person using the console.
+ /// The patient that the kiosk is currently scanning.
+ var/mob/living/carbon/human/altPatient
/obj/machinery/medical_kiosk/Initialize() //loaded subtype for mapping use
. = ..()
scanner_wand = new/obj/item/scanner_wand(src)
-/obj/machinery/medical_kiosk/proc/inuse() //Verifies that the user can use the interface, followed by showing medical information.
- if (pandemonium == TRUE)
- active_price += (rand(10,30)) //The wheel of capitalism says health care ain't cheap.
- if(!istype(C))
- say("No ID card detected.") // No unidentified crew.
- return
- if(C.registered_account)
- account = C.registered_account
- else
- say("No account detected.") //No homeless crew.
- return
- if(!account.has_money(active_price))
- say("You do not possess the funds to purchase this.") //No jobless crew, either.
- return
- else
- account.adjust_money(-active_price)
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_MED)
- if(D)
- D.adjust_money(active_price)
- use_power(20)
- paying_customer = TRUE
- icon_state = "[base_icon_state]_active"
- say("Thank you for your patronage!")
- RefreshParts()
- return
-
/obj/machinery/medical_kiosk/proc/clearScans() //Called it enough times to be it's own proc
scan_active = NONE
update_appearance()
@@ -85,12 +53,6 @@
default_unfasten_wrench(user, I, time = 10)
return TRUE
-/obj/machinery/medical_kiosk/RefreshParts()
- var/obj/item/circuitboard/machine/medical_kiosk/board = circuit
- if(board)
- active_price = board.custom_cost
- return
-
/obj/machinery/medical_kiosk/attackby(obj/item/O, mob/user, params)
if(default_deconstruction_screwdriver(user, "[base_icon_state]_open", "[base_icon_state]_off", O))
return
@@ -135,7 +97,7 @@
scanner_wand = null
/obj/machinery/medical_kiosk/Destroy()
- qdel(scanner_wand)
+ QDEL_NULL(scanner_wand)
return ..()
/obj/machinery/medical_kiosk/emag_act(mob/user)
@@ -179,8 +141,6 @@
ui.open()
icon_state = "[base_icon_state]_active"
RefreshParts()
- H = user
- C = H.get_idcard(TRUE)
/obj/machinery/medical_kiosk/ui_data(mob/living/carbon/human/user)
var/list/data = list()
@@ -299,7 +259,6 @@
else if (user.hallucinating())
chaos_modifier = 0.3
- data["kiosk_cost"] = active_price + (chaos_modifier * (rand(1,25)))
data["patient_name"] = patient_name
data["patient_health"] = round(((total_health - (chaos_modifier * (rand(1,50)))) / max_health) * 100, 0.001)
data["brute_health"] = round(brute_loss+(chaos_modifier * (rand(1,30))),0.001) //To break this down for easy reading, all health values are rounded to the .001 place
@@ -338,29 +297,13 @@
switch(action)
if("beginScan_1")
- if(!(scan_active & KIOSK_SCANNING_GENERAL))
- inuse()
- if(paying_customer == TRUE)
- scan_active |= KIOSK_SCANNING_GENERAL
- paying_customer = FALSE
+ scan_active |= KIOSK_SCANNING_GENERAL
if("beginScan_2")
- if(!(scan_active & KIOSK_SCANNING_SYMPTOMS))
- inuse()
- if(paying_customer == TRUE)
- scan_active |= KIOSK_SCANNING_SYMPTOMS
- paying_customer = FALSE
+ scan_active |= KIOSK_SCANNING_SYMPTOMS
if("beginScan_3")
- if(!(scan_active & KIOSK_SCANNING_NEURORAD))
- inuse()
- if(paying_customer == TRUE)
- scan_active |= KIOSK_SCANNING_NEURORAD
- paying_customer = FALSE
+ scan_active |= KIOSK_SCANNING_NEURORAD
if("beginScan_4")
- if(!(scan_active & KIOSK_SCANNING_REAGENTS))
- inuse()
- if(paying_customer == TRUE)
- scan_active |= KIOSK_SCANNING_REAGENTS
- paying_customer = FALSE
+ scan_active |= KIOSK_SCANNING_REAGENTS
if("clearTarget")
altPatient = null
clearScans()
diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm
index 4dac48d6cfd4..e104257b5493 100644
--- a/code/game/machinery/medipen_refiller.dm
+++ b/code/game/machinery/medipen_refiller.dm
@@ -67,7 +67,7 @@
return
..()
-/obj/machinery/medipen_refiller/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
+/obj/machinery/medipen_refiller/plunger_act(obj/item/plunger/P, mob/living/user)
to_chat(user, "You start furiously plunging [name]. ")
if(do_after(user, 30, target = src))
to_chat(user, "You finish plunging the [name]. ")
diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm
index 60797eaee992..ffaeda72e26d 100644
--- a/code/game/machinery/telecomms/machines/relay.dm
+++ b/code/game/machinery/telecomms/machines/relay.dm
@@ -74,35 +74,40 @@
autolinkers = list("r_relay")
/obj/machinery/telecomms/relay/preset/nanotrasen
- freq_listening = list(FREQ_COMMAND, FREQ_NANOTRASEN, FREQ_COMMON)
+ freq_listening = list(FREQ_COMMAND, FREQ_NANOTRASEN)
id = "Nanotrasen Relay"
network = "nt_commnet"
/obj/machinery/telecomms/relay/preset/inteq
- freq_listening = list(FREQ_COMMAND, FREQ_INTEQ, FREQ_COMMON)
+ freq_listening = list(FREQ_COMMAND, FREQ_INTEQ)
id = "IRMG Relay"
network = "irmg_commnet"
/obj/machinery/telecomms/relay/preset/minutemen
- freq_listening = list(FREQ_COMMAND, FREQ_MINUTEMEN, FREQ_COMMON)
+ freq_listening = list(FREQ_COMMAND, FREQ_MINUTEMEN)
id = "CLIP Relay"
network = "clip_commnet"
/obj/machinery/telecomms/relay/preset/solgov
- freq_listening = list(FREQ_COMMAND, FREQ_SOLGOV, FREQ_COMMON)
+ freq_listening = list(FREQ_COMMAND, FREQ_SOLGOV)
id = "SolGov Relay"
network = "solgov_commnet"
/obj/machinery/telecomms/relay/preset/syndicate
- freq_listening = list(FREQ_COMMAND, FREQ_SYNDICATE, FREQ_COMMON)
+ freq_listening = list(FREQ_COMMAND, FREQ_SYNDICATE)
id = "Syndicate Relay"
network = "synd_commnet"
/obj/machinery/telecomms/relay/preset/frontiersmen
- freq_listening = list(FREQ_COMMAND, FREQ_PIRATE, FREQ_COMMON)
+ freq_listening = list(FREQ_COMMAND, FREQ_PIRATE)
id = "Frontiersmen Relay"
network = "frontier_commnet"
+/obj/machinery/telecomms/relay/preset/pgf
+ freq_listening = list(FREQ_COMMAND, FREQ_PGF)
+ id = "PGF Relay"
+ network = "pgf_commnet"
+
//Generic preset relay
/obj/machinery/telecomms/relay/preset/auto
hide = TRUE
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index a50e72d9fcb7..ccfd89363482 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -72,6 +72,7 @@
var/original_name
desc = "A large piece of space-resistant printed paper."
icon = 'icons/obj/contraband.dmi'
+ icon_state = "poster_ripped"
anchored = TRUE
var/ruined = FALSE
/// how do we want to handle the random poster pool? POSTER_SUBTYPES chooses randomly from subtypes, AKA how it was handled before
@@ -1058,6 +1059,83 @@
desc = "A RILENA: LMR poster split in two to represent the series' disregard for conventional timeline aspects."
icon_state = "poster-rilena_timeline"
+//PGF Mission Accomplished
+/obj/structure/sign/poster/pgf/mission_accomplished_1
+ name = "MISSION ACCOMPLISHED! 1"
+ desc = "MISSION ACCOMPLISHED SOLDIER!"
+ icon_state = "poster-mission_accomplished-1"
+ never_random = TRUE
+
+/obj/item/poster/mission_accomplished_1
+ name = "Mission Accomplished Poster 1"
+ poster_type = /obj/structure/sign/poster/pgf/mission_accomplished_1
+ icon_state = "rolled_poster"
+
+/obj/structure/sign/poster/pgf/mission_accomplished_2
+ name = "MISSION ACCOMPLISHED! 2"
+ desc = "MISSION ACCOMPLISHED SOLDIER!"
+ icon_state = "poster-mission_accomplished-2"
+ never_random = TRUE
+
+/obj/item/poster/mission_accomplished_2
+ name = "Mission Accomplished Poster 2"
+ poster_type = /obj/structure/sign/poster/pgf/mission_accomplished_2
+ icon_state = "rolled_poster"
+
+/obj/structure/sign/poster/pgf/mission_accomplished_3
+ name = "MISSION ACCOMPLISHED! 3"
+ desc = "MISSION ACCOMPLISHED SOLDIER!"
+ icon_state = "poster-mission_accomplished-3"
+ never_random = TRUE
+
+/obj/item/poster/mission_accomplished_3
+ name = "Mission Accomplished Poster 3"
+ poster_type = /obj/structure/sign/poster/pgf/mission_accomplished_3
+ icon_state = "rolled_poster"
+
+/obj/structure/sign/poster/pgf/mission_accomplished_4
+ name = "MISSION ACCOMPLISHED! 4"
+ desc = "MISSION ACCOMPLISHED SOLDIER!"
+ icon_state = "poster-mission_accomplished-4"
+ never_random = TRUE
+
+/obj/item/poster/mission_accomplished_4
+ name = "Mission Accomplished Poster 4"
+ poster_type = /obj/structure/sign/poster/pgf/mission_accomplished_4
+ icon_state = "rolled_poster"
+
+/obj/structure/sign/poster/pgf/mission_accomplished_5
+ name = "MISSION ACCOMPLISHED! 5"
+ desc = "MISSION ACCOMPLISHED SOLDIER!"
+ icon_state = "poster-mission_accomplished-5"
+ never_random = TRUE
+
+/obj/item/poster/mission_accomplished_5
+ name = "Mission Accomplished Poster 5"
+ poster_type = /obj/structure/sign/poster/pgf/mission_accomplished_5
+ icon_state = "rolled_poster"
+
+/obj/structure/sign/poster/pgf/mission_accomplished_6
+ name = "MISSION ACCOMPLISHED! 6"
+ desc = "MISSION ACCOMPLISHED SOLDIER!"
+ icon_state = "poster-mission_accomplished-6"
+ never_random = TRUE
+
+/obj/item/poster/mission_accomplished_6
+ name = "Mission Accomplished Poster 6"
+ poster_type = /obj/structure/sign/poster/pgf/mission_accomplished_6
+ icon_state = "rolled_poster"
+
+/obj/structure/sign/poster/pgf/mission_accomplished_7
+ name = "MISSION ACCOMPLISHED! 7"
+ desc = "MISSION ACCOMPLISHED SOLDIER!"
+ icon_state = "poster-mission_accomplished-7"
+ never_random = TRUE
+
+/obj/item/poster/mission_accomplished_7
+ name = "Mission Accomplished Poster 7"
+ poster_type = /obj/structure/sign/poster/pgf/mission_accomplished_7
+ icon_state = "rolled_poster"
#undef PLACE_SPEED
diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm
index f283de309cc8..798eeeb9b166 100644
--- a/code/game/objects/effects/decals/cleanable/robots.dm
+++ b/code/game/objects/effects/decals/cleanable/robots.dm
@@ -35,12 +35,12 @@
random_icon_states = list("gibarm", "gibleg")
/obj/effect/decal/cleanable/robot_debris/up
- icon_state = "gibup1"
- random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup1","gibup1")
+ icon_state = "gibup"
+ random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup","gibup")
/obj/effect/decal/cleanable/robot_debris/down
- icon_state = "gibdown1"
- random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown1","gibdown1")
+ icon_state = "gibdown"
+ random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown","gibdown")
/obj/effect/decal/cleanable/oil
name = "motor oil"
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 173764fdf198..c14086ff0f3b 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -37,6 +37,7 @@ GLOBAL_LIST(gang_tags)
name = "Leet Like Jeff K gang tag"
desc = "Looks like someone's claimed this area for Leet Like Jeff K."
icon = 'icons/obj/gang/tags.dmi'
+ icon_state = "B_tag"
layer = BELOW_MOB_LAYER
var/datum/team/gang/my_gang
diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
index a3ad1f1af13d..975f94102ecf 100644
--- a/code/game/objects/effects/decals/decal.dm
+++ b/code/game/objects/effects/decals/decal.dm
@@ -40,7 +40,7 @@
/obj/effect/turf_decal
icon = 'icons/turf/decals.dmi'
- icon_state = "warningline"
+ icon_state = "warningfulltile"
plane = FLOOR_PLANE
layer = TURF_DECAL_LAYER
var/detail_overlay
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index b5c6f9fe0eec..f56bebfc7ba0 100644
--- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
+++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -416,14 +416,6 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
icon_state = "plaque"
icon = 'icons/turf/decals.dmi'
-/obj/effect/turf_decal/asteroid
- name = "random asteroid rubble"
- icon_state = "asteroid0"
-
-/obj/effect/turf_decal/asteroid/New()
- icon_state = "asteroid[rand(0,9)]"
- ..()
-
/obj/effect/turf_decal/chapel
name = "chapel"
icon_state = "chapel"
@@ -1053,6 +1045,17 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
/obj/effect/turf_decal/ntspaceworks_big/eight
icon_state = "ntspaceworks_big-8"
+//Etherbor Lihmona Shipyards
+
+/obj/effect/turf_decal/etherbor/left
+ icon_state = "etherbor_left"
+
+/obj/effect/turf_decal/etherbor/center
+ icon_state = "etherbor_center"
+
+/obj/effect/turf_decal/etherbor/right
+ icon_state = "etherbor_right"
+
//Hardline Salvage and Mining
/obj/effect/turf_decal/hardline_small
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index c8332e1dd0cd..b08d7bf6737c 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -187,7 +187,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/psychologist
name = "Psychologist"
- icon_state = "Psychologist"
+ icon_state = "Curator"
/obj/effect/landmark/start/chaplain
name = "Chaplain"
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index b21c0b7073d5..73b96c29768c 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -1,12 +1,3 @@
-//The effect when you wrap a dead body in gift wrap
-/obj/effect/spresent
- name = "strange present"
- desc = "It's a ... present?"
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "strangepresent"
- density = TRUE
- anchored = FALSE
-
/obj/effect/beam
name = "beam"
var/def_zone
@@ -83,7 +74,6 @@
/obj/effect/abstract/marker/at
name = "active turf marker"
-
/obj/effect/dummy/lighting_obj
name = "lighting fx obj"
desc = "Tell a coder if you're seeing this."
diff --git a/code/game/objects/effects/radiation.dm b/code/game/objects/effects/radiation.dm
index 6a0d53907ced..d9984e601810 100644
--- a/code/game/objects/effects/radiation.dm
+++ b/code/game/objects/effects/radiation.dm
@@ -6,29 +6,39 @@
var/rad_power = 33
var/rad_range = 1 // !Range mod = rad dropoff speed
var/rad_spread = 6 // Range of nearby atoms to radiate
- var/rad_delay = 20
var/rad_prob = 10
- var/_pulse = 0 // Holds the world.time interval in process
+ COOLDOWN_DECLARE(pulse_cooldown)
+ var/rad_delay = 2 SECONDS
/obj/effect/radiation/Initialize()
START_PROCESSING(SSobj, src)
. = ..()
/obj/effect/radiation/process()
- if(world.time > _pulse)
- for(var/obj/O in range(rad_spread, src))
- if(prob(rad_prob))
- radiation_pulse(O, rad_power, rad_range)
- _pulse = world.time + rad_delay
+ if(!COOLDOWN_FINISHED(src, pulse_cooldown))
+ return ..()
+
+ var/player_in_range = FALSE
+ for(var/mob/living/L in range(rad_spread))
+ if(L.client)
+ player_in_range = TRUE
+ break
+ if(!player_in_range)
+ return ..()
+ COOLDOWN_START(src, pulse_cooldown, rad_delay)
+ for(var/obj/O in range(rad_spread, src))
+ if(prob(rad_prob))
+ radiation_pulse(O, rad_power, rad_range)
+
..()
/obj/effect/radiation/waste
rad_power = 33
- rad_delay = 40
+ rad_delay = 4 SECONDS
rad_prob = 20
rad_spread = 3
/obj/effect/radiation/waste/intense //3.6 roetgen. Not bad. Not good.
rad_power = 120
- rad_delay = 80
+ rad_delay = 8 SECONDS
rad_prob = 10
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 8c8c8f900aab..4913f9b835ce 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -115,17 +115,14 @@
/obj/effect/temp_visual/dir_setting/wraith
name = "shadow"
icon = 'icons/mob/mob.dmi'
- icon_state = "phase_shift2"
+ icon_state = "revenant_idle"
duration = 6
/obj/effect/temp_visual/dir_setting/wraith/angelic
- icon_state = "phase_shift2_angelic"
/obj/effect/temp_visual/dir_setting/wraith/out
- icon_state = "phase_shift"
/obj/effect/temp_visual/dir_setting/wraith/out/angelic
- icon_state = "phase_shift_angelic"
/obj/effect/temp_visual/dir_setting/tailsweep
icon_state = "tailsweep"
@@ -157,7 +154,7 @@
fades = TRUE
/obj/effect/temp_visual/dir_setting/curse/hand
- icon_state = "cursehand"
+ icon_state = "cursehand0"
/obj/effect/temp_visual/dir_setting/space_wind
icon = 'icons/effects/atmospherics.dmi'
@@ -174,7 +171,7 @@
name = "\improper Bluespace energy wave"
desc = "A massive, rippling wave of bluepace energy, all rapidly exhausting itself the moment it leaves the concentrated beam of light."
icon = 'icons/effects/beam_splash.dmi'
- icon_state = "beam_splash_l"
+ icon_state = "beam_splash_e"
layer = ABOVE_ALL_MOB_LAYER
pixel_y = -16
duration = 50
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
index 8fe5e7cf5340..b850681c713f 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
@@ -6,7 +6,7 @@
icon_state = "muzzle_laser"
/obj/effect/projectile/muzzle/laser/blue
- icon_state = "muzzle_laser_blue"
+ icon_state = "muzzle_blue"
/obj/effect/projectile/muzzle/laser/emitter
name = "emitter flash"
diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm
index 6d04e2e505ff..d7fca8e0048c 100644
--- a/code/game/objects/items/binoculars.dm
+++ b/code/game/objects/items/binoculars.dm
@@ -3,8 +3,6 @@
desc = "Used for long-distance surveillance."
item_state = "binoculars"
icon_state = "binoculars"
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
var/mob/listeningTo
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index ce5afeba737a..630759c85afe 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -304,10 +304,6 @@
set_new_account(user)
return
- if (world.time < registered_account.withdrawDelay)
- registered_account.bank_card_talk("ERROR: UNABLE TO LOGIN DUE TO SCHEDULED MAINTENANCE. MAINTENANCE IS SCHEDULED TO COMPLETE IN [(registered_account.withdrawDelay - world.time)/10] SECONDS. ", TRUE)
- return
-
var/amount_to_remove = FLOOR(input(user, "How much do you want to withdraw? Current Balance: [registered_account.account_balance]", "Withdraw Funds", 5) as num|null, 1)
if(!amount_to_remove || amount_to_remove < 0)
@@ -322,18 +318,13 @@
log_econ("[amount_to_remove] credits were removed from [src] owned by [src.registered_name]")
return
else
- if (registered_account.frozen)
- registered_account.bank_card_talk("ERROR: The linked account is frozen! Contact your department head. ", TRUE)
- else
- var/difference = amount_to_remove - registered_account.account_balance
- registered_account.bank_card_talk("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal. ", TRUE)
+ var/difference = amount_to_remove - registered_account.account_balance
+ registered_account.bank_card_talk("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal. ", TRUE)
/obj/item/card/id/examine(mob/user)
. = ..()
if(registered_account)
. += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
- if(registered_account.frozen)
- . += "The linked account is frozen, and cannot be withdrawn from or deposited into! "
. += "There's more information below, you can look again to take a closer look... You add [value] credits worth of money to the bundle. ")
- qdel(src)
+ bundle.transfer_value(bundle.value, src)
/obj/item/spacecash/Destroy()
- . = ..()
+ SSeconomy.physical_money -= value
value = 0 // Prevents money from be duplicated anytime.//I'll trust eris on this one
+ return ..()
/obj/item/spacecash/bundle
icon_state = "credit20"
-/obj/item/spacecash/bundle/Initialize()
- . = ..()
- update_appearance()
-
/obj/item/spacecash/bundle/update_appearance()
icon_state = "nothing"
cut_overlays()
@@ -122,45 +136,35 @@
to_chat(usr, "You need to be in arm's reach for that! ")
return
- value -= cashamount
- if(!value)
- usr.dropItemToGround(src)
- qdel(src)
-
- var/obj/item/spacecash/bundle/bundle = new (usr.loc)
- bundle.value = cashamount
- bundle.update_appearance()
+ var/obj/item/spacecash/bundle/bundle = new(usr.loc)
+ transfer_value(cashamount, bundle)
usr.put_in_hands(bundle)
update_appearance()
/obj/item/spacecash/bundle/AltClick(mob/living/user)
- var/cashamount = input(usr, "How many credits do you want to take? (0 to [value])", "Take Money", 20) as num
+ var/cashamount = input(user, "How many credits do you want to take? (0 to [value])", "Take Money", 20) as num
cashamount = round(clamp(cashamount, 0, value))
if(!cashamount)
return
- else if(!Adjacent(usr))
- to_chat(usr, "You need to be in arm's reach for that! ")
+ else if(!Adjacent(user))
+ to_chat(user, "You need to be in arm's reach for that! ")
return
- value -= cashamount
+ adjust_value(-cashamount)
if(!value)
- usr.dropItemToGround(src)
+ user.dropItemToGround(src)
qdel(src)
- var/obj/item/spacecash/bundle/bundle = new (usr.loc)
- bundle.value = cashamount
- bundle.update_appearance()
- usr.put_in_hands(bundle)
- update_appearance()
+ var/obj/item/spacecash/bundle/bundle = new(user.loc, cashamount)
+ user.put_in_hands(bundle)
/obj/item/spacecash/bundle/attack_hand(mob/user)
if(user.get_inactive_held_item() == src)
if(value == 0)//may prevent any edge case duping
qdel(src)
return
- var/nuvalue = value - 1
- value = nuvalue
+ adjust_value(-1)
user.put_in_hands(new /obj/item/spacecash/bundle(loc, 1))
update_appearance()
else
diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm
index 888bebac8095..f63a5e9dd45a 100644
--- a/code/game/objects/items/chrono_eraser.dm
+++ b/code/game/objects/items/chrono_eraser.dm
@@ -147,7 +147,7 @@
/obj/item/ammo_casing/energy/chrono_beam
name = "eradication beam"
projectile_type = /obj/projectile/energy/chrono_beam
- icon_state = "chronobolt"
+ icon_state = "caseless"
e_cost = 0
var/obj/item/gun/energy/chrono_gun/gun
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index a60600b3661f..0258e86e8a7f 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -45,7 +45,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
damtype = "fire"
force = 3
hitsound = 'sound/items/welder.ogg'
- item_state = "cigon"
name = "lit [initial(name)]"
desc = "A [initial(name)]. This one is lit."
attack_verb = list("burnt","singed")
@@ -59,7 +58,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
damtype = "brute"
force = initial(force)
icon_state = "match_burnt"
- item_state = "cigoff"
name = "burnt [initial(name)]"
desc = "A [initial(name)]. This one has seen better days."
attack_verb = list("flicked")
@@ -116,7 +114,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A roll of tobacco and nicotine."
icon_state = "cigoff"
throw_speed = 0.5
- item_state = "cigoff"
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
grind_results = list()
@@ -418,7 +415,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_off = "cigaroff" //make sure to add positional sprites in icons/obj/cigarettes.dmi if you add more.
type_butt = /obj/item/cigbutt/cigarbutt
throw_speed = 0.5
- item_state = "cigaroff"
smoketime = 300 // 11 minutes
chem_volume = 40
list_reagents = list(/datum/reagent/drug/nicotine = 25)
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 306634a639fc..7b2724f9e53f 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -811,24 +811,10 @@
name = "Medical Kiosk (Machine Board)"
icon_state = "medical"
build_path = /obj/machinery/medical_kiosk
- var/custom_cost = 10
req_components = list(
/obj/item/healthanalyzer = 1,
/obj/item/stock_parts/scanning_module = 1)
-/obj/item/circuitboard/machine/medical_kiosk/multitool_act(mob/living/user)
- . = ..()
- var/new_cost = input("Set a new cost for using this medical kiosk.","New cost", custom_cost) as num|null
- if(!new_cost || (loc != user))
- to_chat(user, "You must hold the circuitboard to change its cost! ")
- return
- custom_cost = clamp(round(new_cost, 1), 10, 1000)
- to_chat(user, "The cost is now set to [custom_cost]. ")
-
-/obj/item/circuitboard/machine/medical_kiosk/examine(mob/user)
- . = ..()
- . += "The cost to use this kiosk is set to [custom_cost]."
-
/obj/item/circuitboard/machine/limbgrower
name = "Limb Grower (Machine Board)"
icon_state = "medical"
diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm
index 9a6663cf2046..fdc17fa8d97f 100644
--- a/code/game/objects/items/credit_holochip.dm
+++ b/code/game/objects/items/credit_holochip.dm
@@ -13,6 +13,11 @@
. = ..()
credits = amount
update_appearance()
+ SSeconomy.physical_money += amount
+
+/obj/item/holochip/Destroy()
+ SSeconomy.physical_money -= credits
+ return ..()
/obj/item/holochip/examine(mob/user)
. = ..()
@@ -77,6 +82,7 @@
/obj/item/holochip/proc/spend(amount, pay_anyway = FALSE)
if(credits >= amount)
credits -= amount
+ SSeconomy.physical_money -= amount
if(credits == 0)
qdel(src)
update_appearance()
@@ -92,6 +98,7 @@
if(istype(I, /obj/item/holochip))
var/obj/item/holochip/H = I
credits += H.credits
+ SSeconomy.physical_money += H.credits
to_chat(user, "You insert the credits into [src]. ")
update_appearance()
qdel(H)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 584bbcc1227f..6528ef4851c7 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -253,7 +253,7 @@
name = "banana lamp"
desc = "Only a clown would think to make a ghetto banana-shaped lamp. Even has a goofy pullstring."
icon_state = "bananalamp"
- item_state = "bananalamp"
+ item_state = "lampgreen"
// FLARES
diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm
index 60cfe4eb89b3..6fa07cf3f8ce 100644
--- a/code/game/objects/items/devices/pressureplates.dm
+++ b/code/game/objects/items/devices/pressureplates.dm
@@ -2,7 +2,6 @@
name = "pressure plate"
desc = "An electronic device that triggers when stepped on. Ctrl-Click to toggle the pressure plate off and on."
icon = 'icons/obj/puzzle_small.dmi'
- item_state = "flash"
icon_state = "pressureplate"
layer = LOW_OBJ_LAYER
var/trigger_mob = TRUE
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 0904cdef3676..73cae6b853bc 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -42,9 +42,14 @@
/obj/item/encryptionkey/minutemen
name = "minutemen encryption key"
- icon_state = "clip_cypherkey"
+ icon_state = "cmm_cypherkey"
channels = list(RADIO_CHANNEL_MINUTEMEN = 1)
+/obj/item/encryptionkey/pgf
+ name = "pgf encryption key"
+ icon_state = "bin_cypherkey"
+ channels = list(RADIO_CHANNEL_PGF = 1)
+
/obj/item/encryptionkey/inteq
name = "inteq encryption key"
icon_state = "irmg_cypherkey"
@@ -57,7 +62,7 @@
/obj/item/encryptionkey/headset_com
name = "command radio encryption key"
- icon_state = "comm_cypherkey"
+ icon_state = "com_cypherkey"
channels = list(RADIO_CHANNEL_COMMAND = 1)
/obj/item/encryptionkey/heads/captain
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 574dd88e5cc4..e44cf557b9a2 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -7,6 +7,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE,
RADIO_CHANNEL_NANOTRASEN = RADIO_TOKEN_NANOTRASEN, //Shiptest edits - faction channels, removed department channels
RADIO_CHANNEL_MINUTEMEN = RADIO_TOKEN_MINUTEMEN,
+ RADIO_CHANNEL_PGF = RADIO_TOKEN_PGF,
RADIO_CHANNEL_INTEQ = RADIO_TOKEN_INTEQ,
RADIO_CHANNEL_PIRATE = RADIO_TOKEN_PIRATE,
MODE_BINARY = MODE_TOKEN_BINARY,
@@ -79,7 +80,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "bowman headset"
desc = "An updated, modular intercom that fits over the head. Protects ears from flashbangs."
icon_state = "headset_alt"
- item_state = "headset_alt"
/obj/item/radio/headset/alt/ComponentInitialize()
. = ..()
@@ -90,7 +90,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "syndicate headset"
desc = "A headset worn by members of the various Syndicate splinters on the frontier."
icon_state = "syndie_headset"
- item_state = "syndie_headset"
keyslot = new /obj/item/encryptionkey/syndicate
/obj/item/radio/headset/syndicate/captain
@@ -103,7 +102,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "syndicate bowman headset"
desc = "A headset worn by members of the various Syndicate splinters on the frontier. Protects ears from flashbangs."
icon_state = "syndie_headset_alt"
- item_state = "syndie_headset_alt"
/obj/item/radio/headset/syndicate/alt/captain
name = "syndicate leader bowman headset"
@@ -136,7 +134,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "nanotrasen bowman headset"
desc = "Worn proudly by the battered remnants of Nanotrasen's frontier holdings. Protects ears from flashbangs."
icon_state = "nanotrasen_headset_alt"
- item_state = "nanotrasen_headset_alt"
/obj/item/radio/headset/nanotrasen/alt/captain
name = "nanotrasen captain's bowman headset"
@@ -163,9 +160,8 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/clip/alt
name = "minutemen bowman headset"
- desc = "Used by militias flying the five stars of the CLIP Minutemen. Protects ears from flashbangs."
- icon_state = "clip_headset_alt"
- item_state = "clip_headset_alt"
+ desc = "Used by militias flying the five stars of the Colonial Minutemen. Protects ears from flashbangs."
+ mob_overlay_state = "cmm_headset_alt"
/obj/item/radio/headset/clip/alt/captain
name = "minuteman officer bowman headset"
@@ -194,7 +190,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "inteq bowman headset"
desc = "This is used by Inteq Risk Management Group's mercenaries. Protects ears from flashbangs."
icon_state = "inteq_headset_alt"
- item_state = "inteq_headset_alt"
/obj/item/radio/headset/inteq/alt/captain
name = "vanguard bowman headset"
@@ -223,7 +218,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "pirate bowman headset"
desc = "Used to sing shanties across the vast emptiness of space, and complain about Minuteman patrols. Protects ears from flashbangs."
icon_state = "pirate_headset_alt"
- item_state = "pirate_headset_alt"
/obj/item/radio/headset/pirate/alt/captain
name = "pirate captain bowman headset"
@@ -235,6 +229,29 @@ GLOBAL_LIST_INIT(channel_tokens, list(
. = ..()
AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
+//PGF
+/obj/item/radio/headset/pgf
+ name = "\improper PGF headset"
+ desc = "A headset often worn by members of the PGFN and PGFMC."
+ keyslot = new /obj/item/encryptionkey/pgf
+
+/obj/item/radio/headset/pgf/captain
+ name = "\improper PGF official radio headset"
+ desc = "Worn by various officials and leaders serving the PGFN or PGFMC."
+ keyslot2 = new /obj/item/encryptionkey/heads/captain
+ command = TRUE
+
+/obj/item/radio/headset/pgf/alt
+ name = "\improper PGF bowman headset"
+ desc = "A headset often worn by members of the PGFN and PGFMC. Protects ears from flashbangs."
+ icon_state = "solgov_headset_alt"
+
+/obj/item/radio/headset/pgf/alt/captain
+ name = "\improper PGF official bowman headset"
+ desc = "Worn by various officials and leaders serving the PGFN or PGFMC. Protects ears from flashbangs."
+ keyslot2 = new /obj/item/encryptionkey/heads/captain
+ command = TRUE
+
//solgov
/obj/item/radio/headset/solgov
name = "\improper SolGov headset"
@@ -274,7 +291,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "command bowman headset"
desc = "An officer's headset. Protects ears from flashbangs."
icon_state = "com_headset_alt"
- item_state = "com_headset_alt"
/obj/item/radio/headset/headset_com/alt/ComponentInitialize()
. = ..()
@@ -294,7 +310,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "captain's bowman headset"
desc = "Dresses the ears of independent ship captains across the frontier. Protects ears from flashbangs."
icon_state = "com_headset_alt"
- item_state = "com_headset_alt"
/obj/item/radio/headset/heads/captain/alt/ComponentInitialize()
. = ..()
@@ -326,7 +341,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "\improper CentCom bowman headset"
desc = "A headset especially for emergency response personnel. Protects ears from flashbangs."
icon_state = "cent_headset_alt"
- item_state = "cent_headset_alt"
keyslot = null
/obj/item/radio/headset/headset_cent/alt/ComponentInitialize()
@@ -354,7 +368,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "security bowman headset"
desc = "This is used by your elite security force. Protects ears from flashbangs."
icon_state = "sec_headset_alt"
- item_state = "sec_headset_alt"
/obj/item/radio/headset/headset_sec/alt/ComponentInitialize()
. = ..()
@@ -423,7 +436,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
name = "\proper the head of security's bowman headset"
desc = "The headset of the man in charge of keeping order and protecting the innocent. Protects ears from flashbangs."
icon_state = "com_headset_alt"
- item_state = "com_headset_alt"
/obj/item/radio/headset/heads/hos/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index a91789c542cd..2c7262139b17 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -152,6 +152,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 31)
/obj/item/wallframe/intercom/table
icon_state = "intercom-table"
+ icon = 'icons/obj/radio.dmi'
result_path = /obj/item/radio/intercom/table
pixel_shift = 0
@@ -197,5 +198,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/wideband, 26)
/obj/item/wallframe/intercom/wideband/table
icon_state = "intercom-wideband-table"
+ icon = 'icons/obj/radio.dmi'
result_path = /obj/item/radio/intercom/wideband/table
pixel_shift = 0
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index e95ab85cda9d..dc35bebb1e30 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -2,7 +2,9 @@
icon = 'icons/obj/radio.dmi'
name = "shortwave radio"
icon_state = "walkietalkie"
- item_state = "walkietalkie"
+ item_state = "radio"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
desc = "A basic handheld radio that communicates with local telecommunication networks."
pickup_sound = 'sound/items/handling/device_pickup.ogg'
drop_sound = 'sound/items/handling/device_drop.ogg'
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 4f034824e2f4..b25cc10636e2 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -185,7 +185,7 @@ effective or pretty fucking useless.
name = "cloaker belt"
desc = "Makes you invisible for short periods of time. Recharges in darkness."
icon = 'icons/obj/clothing/belts.dmi'
- icon_state = "utilitybelt"
+ icon_state = "utility"
item_state = "utility"
slot_flags = ITEM_SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index dc49ee2dc6ae..7ddb02035927 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -65,7 +65,7 @@
/obj/item/dualsaber/update_icon_state()
- icon_state = wielded ? "dualsaber[saber_color][wielded]" : "dualsaber0"
+ icon_state = wielded ? "dualsaber[saber_color]" : "dualsaber"
return ..()
/obj/item/dualsaber/Initialize()
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 01f147a1b1d0..496fc07288ec 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -217,7 +217,7 @@
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "legcuff"
+ icon_state = "handcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
flags_1 = CONDUCT_1
diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
index fd79c112c9b1..871f8f8a133d 100644
--- a/code/game/objects/items/implants/implant.dm
+++ b/code/game/objects/items/implants/implant.dm
@@ -1,7 +1,7 @@
/obj/item/implant
name = "implant"
icon = 'icons/obj/implants.dmi'
- icon_state = "generic" //Shows up as the action button icon
+ icon_state = "lighting_bolt" //Idk seemes liek the best option, Needs a generic icon but this works
actions_types = list(/datum/action/item_action/hands_free/activate)
var/activated = TRUE //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants
var/mob/living/imp_in = null
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index cd22652120d7..c4c832209bac 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -1,7 +1,6 @@
/obj/item/implant/weapons_auth
name = "firearms authentication implant"
desc = "Lets you shoot your guns."
- icon_state = "auth"
activated = 0
/obj/item/implant/weapons_auth/get_data()
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index 3865f961950c..0ba32f33099a 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -276,51 +276,6 @@
/obj/item/clothing/head/helmet/plate/crusader/red
icon_state = "crusader-red"
-//Prophet helmet
-/obj/item/clothing/head/helmet/plate/crusader/prophet
- name = "Prophet's Hat"
- desc = "A religious-looking hat."
- mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
- flags_1 = 0
- armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 70, "bio" = 50, "rad" = 50, "fire" = 60, "acid" = 60) //religion protects you from disease and radiation, honk.
- worn_x_dimension = 64
- worn_y_dimension = 64
-
-/obj/item/clothing/head/helmet/plate/crusader/prophet/red
- icon_state = "prophet-red"
-
-/obj/item/clothing/head/helmet/plate/crusader/prophet/blue
- icon_state = "prophet-blue"
-
-//Structure conversion staff
-/obj/item/godstaff
- name = "godstaff"
- desc = "It's a stick..?"
- icon_state = "godstaff-red"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
- var/conversion_color = "#ffffff"
- var/staffcooldown = 0
- var/staffwait = 30
-
-
-/obj/item/godstaff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- . = ..()
- if(staffcooldown + staffwait > world.time)
- return
- user.visible_message("[user] chants deeply and waves [user.p_their()] staff! ")
- if(do_after(user, 20,1,src))
- target.add_atom_colour(conversion_color, WASHABLE_COLOUR_PRIORITY) //wololo
- staffcooldown = world.time
-
-/obj/item/godstaff/red
- icon_state = "godstaff-red"
- conversion_color = "#ff0000"
-
-/obj/item/godstaff/blue
- icon_state = "godstaff-blue"
- conversion_color = "#0000ff"
-
/obj/item/clothing/gloves/plate
name = "Plate Gauntlets"
icon_state = "crusader"
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index c5ebe82f90e9..a0e5865e1528 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -4,7 +4,6 @@
/obj/item/borg
icon = 'icons/mob/robot_items.dmi'
-
/obj/item/borg/stun
name = "electrically-charged arm"
icon_state = "elecarm"
@@ -543,7 +542,7 @@
name = "\improper Hyperkinetic Dampening projector"
desc = "A device that projects a dampening field that weakens kinetic energy above a certain threshold. Projects a field that drains power per second while active, that will weaken and slow damaging projectiles inside its field. Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
icon = 'icons/obj/device.dmi'
- icon_state = "shield"
+ icon_state = "shield0"
var/maxenergy = 1500
var/energy = 1500
var/energy_recharge = 7.5
@@ -710,7 +709,7 @@
/obj/item/borg/sight/material
name = "\proper material vision"
sight_mode = BORGMATERIAL
- icon_state = "material"
+ icon_state = "meson"
/obj/item/borg/sight/hud
name = "hud"
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 46d92aa9b6f8..09b2338b244f 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -785,7 +785,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
name = "pepperoni sheetzzas"
desc = "It's a delicious pepperoni sheetzza!"
singular_name = "pepperoni sheetzza"
- icon_state = "sheet-pizza"
+ icon_state = "sheet-meat" //This needs a pizza sheet but we also i dont think anyone will ever make this.
custom_materials = list(/datum/material/pizza = MINERAL_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/sheet/pizza
material_type = /datum/material/pizza
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 157f9c611f30..d6ef29b86233 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -441,7 +441,6 @@
"Snow" = "militarywebbing_snow",
"Urban" = "militarywebbing_urban",
)
- unique_reskin = null
//this might seem obtuse instead of setting allow_post_reskins to TRUE, but reskin menu would open every time on alt click, which is not good for this
/obj/item/storage/belt/military/examine(mob/user)
@@ -521,7 +520,7 @@
name = "agent belt"
desc = "A belt used by abductor agents."
icon = 'icons/obj/abductor.dmi'
- icon_state = "grenadebeltnew"
+ icon_state = "belt"
item_state = "grenadebeltnew"
unique_reskin = null
@@ -913,7 +912,7 @@
item_state = "suns-cane"
w_class = WEIGHT_CLASS_BULKY
-/obj/item/storage/belt/sabre/suns/ComponentInitialize()
+/obj/item/storage/belt/sabre/suns/cmo/ComponentInitialize()
AddComponent(component_type)
AddElement(/datum/element/update_icon_updates_onmob)
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
@@ -924,7 +923,7 @@
/obj/item/melee/sabre/suns/cmo
))
-/obj/item/storage/belt/sabre/suns/PopulateContents()
+/obj/item/storage/belt/sabre/suns/cmo/PopulateContents()
new /obj/item/melee/sabre/suns/cmo(src)
update_appearance()
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index a0ce4670c0bf..45fee1d67660 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -246,12 +246,6 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
item_state = "koran"
deity_name = "Allah"
-/obj/item/storage/book/bible/torah
- name = "Torah"
- icon_state = "torah"
- item_state = "torah"
- deity_name = "YHWH"
-
/obj/item/storage/book/bible/booze
desc = "To be applied to the head repeatedly."
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index e9bc325bef88..3c9395208fad 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -99,7 +99,7 @@
for(var/i in 1 to 7)
new /obj/item/disk/data(src)
-
+//guys why are my tests failing
/obj/item/storage/box/disks_plantgene
name = "plant data disks box"
illustration = "disk_kit"
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index f53674195d42..00c619da8353 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -731,7 +731,7 @@
name = "hand of cards"
desc = "A number of cards not in a deck, customarily held in ones hand."
icon = 'icons/obj/toy.dmi'
- icon_state = "none"
+ icon_state = "nothing"
w_class = WEIGHT_CLASS_TINY
var/list/currenthand = list()
var/choice = null
diff --git a/code/game/objects/items/wayfinding.dm b/code/game/objects/items/wayfinding.dm
index 848ade225ce2..984614529186 100644
--- a/code/game/objects/items/wayfinding.dm
+++ b/code/game/objects/items/wayfinding.dm
@@ -1,124 +1,3 @@
-/obj/machinery/pinpointer_dispenser
- name = "wayfinding pinpointer synthesizer"
- icon = 'icons/obj/machines/wayfinding.dmi'
- icon_state = "pinpointersynth"
- desc = "Having trouble finding your way? This machine synthesizes pinpointers that point to common locations."
- density = FALSE
- layer = HIGH_OBJ_LAYER
- var/list/user_spawn_cooldowns = list()
- var/list/user_interact_cooldowns = list()
- var/spawn_cooldown = 5 MINUTES //time per person to spawn another pinpointer
- var/interact_cooldown = 20 SECONDS //time per person for subsequent interactions
- var/start_bal = 200 //how much money it starts with to cover wayfinder refunds
- var/refund_amt = 40 //how much money recycling a pinpointer rewards you
- var/static/datum/bank_account/synth_acc = new /datum/bank_account/remote
- var/ppt_cost = 65 //Jan 6 '20: Assistant can buy one roundstart (125 cr starting)
- var/expression_timer
-
-/obj/machinery/pinpointer_dispenser/Initialize(mapload)
- . = ..()
- synth_acc.adjust_money(start_bal)
-
- synth_acc.account_holder = name
-
- desc += " Only [ppt_cost] credits! It also likes making costumes..."
-
- set_expression("neutral")
-
-/obj/machinery/pinpointer_dispenser/attack_hand(mob/living/carbon/user)
- if(world.time < user_interact_cooldowns[user.real_name])
- to_chat(user, "It doesn't respond. ")
- return
-
- user_interact_cooldowns[user.real_name] = world.time + interact_cooldown
-
- for(var/obj/item/pinpointer/wayfinding/WP in user.GetAllContents())
- set_expression("unsure", 2 SECONDS)
- say("I can detect the pinpointer on you, [user.first_name()]. ")
- user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown //spawn timer resets for trickers
- return
-
- var/msg
- var/dispense = TRUE
- var/obj/item/pinpointer/wayfinding/pointat
- for(var/obj/item/pinpointer/wayfinding/WP in range(7, user))
- if(WP.Adjacent(user))
- set_expression("facepalm", 2 SECONDS)
- say("[WP.owner == user.real_name ? "Your" : "A"] pinpointer is right there. ")
- pointat(WP)
- user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown
- return
- else if(WP in oview(7, user))
- pointat = WP
- break
-
- if(world.time < user_spawn_cooldowns[user.real_name])
- var/secsleft = (user_spawn_cooldowns[user.real_name] - world.time) / 10
- msg += "to wait another [secsleft/60 > 1 ? "[round(secsleft/60,1)] minute\s" : "[round(secsleft)] second\s"]"
- dispense = FALSE
-
- var/datum/bank_account/cust_acc = null
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(H.get_bank_account())
- cust_acc = H.get_bank_account()
-
- if(cust_acc)
- if(!cust_acc.has_money(ppt_cost))
- msg += "[!msg ? "to find [ppt_cost-cust_acc.account_balance] more credit\s" : " and find [ppt_cost-cust_acc.account_balance] more credit\s"]"
- dispense = FALSE
-
- if(!dispense)
- set_expression("sad", 2 SECONDS)
- if(pointat)
- msg += ". I suggest you get [pointat.owner == user.real_name ? "your" : "that"] pinpointer over there instead"
- pointat(pointat)
- say("You will need [msg], [user.first_name()]. ")
- return
-
- if(synth_acc.transfer_money(cust_acc, ppt_cost))
- set_expression("veryhappy", 2 SECONDS)
- say("That is [ppt_cost] credits. Here is your pinpointer. ")
- var/obj/item/pinpointer/wayfinding/P = new /obj/item/pinpointer/wayfinding(get_turf(src))
- user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown
- user.put_in_hands(P)
- P.owner = user.real_name
-
-/obj/machinery/pinpointer_dispenser/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/pinpointer/wayfinding))
- var/obj/item/pinpointer/wayfinding/WP = I
- to_chat(user, "You put \the [WP] in the return slot. ")
- var/rfnd_amt
- if((!WP.roundstart || WP.owner != user.real_name) && synth_acc.has_money(TRUE)) //can't recycle own pinpointer for money if not bought; given by a neutral quirk
- if(synth_acc.has_money(refund_amt))
- rfnd_amt = refund_amt
- else
- rfnd_amt = synth_acc.account_balance
- synth_acc._adjust_money(-rfnd_amt)
- var/obj/item/holochip/HC = new /obj/item/holochip(user.loc)
- HC.credits = rfnd_amt
- HC.name = "[HC.credits] credit holochip"
- if(istype(user, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = user
- H.put_in_hands(HC)
- else
- var/crap = pick(subtypesof(/obj/effect/spawner/bundle/costume)) //harmless garbage some people may appreciate
- new crap(user.loc)
- qdel(WP)
- set_expression("happy", 2 SECONDS)
- say("Thank you for recycling, [user.first_name()]! Here is [rfnd_amt ? "[rfnd_amt] credits." : "a freshly synthesized costume!"] ")
-
-/obj/machinery/pinpointer_dispenser/proc/set_expression(type, duration)
- cut_overlays()
- deltimer(expression_timer)
- add_overlay(type)
- if(duration)
- expression_timer = addtimer(CALLBACK(src, PROC_REF(set_expression), "neutral"), duration, TIMER_STOPPABLE)
-
-/obj/machinery/pinpointer_dispenser/proc/pointat(atom)
- visible_message("[src] points at [atom].")
- new /obj/effect/temp_visual/point(atom,invisibility)
-
//Pinpointer itself
/obj/item/pinpointer/wayfinding //Help players new to a station find their way around
name = "wayfinding pinpointer"
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 688122b2c23c..d4ad3f0e679e 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -388,7 +388,7 @@
return TRUE
return ..()
-/obj/proc/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
+/obj/proc/plunger_act(obj/item/plunger/P, mob/living/user)
return
// Should move all contained objects to it's location.
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 3bf8d8bd0dbd..15cbb9481f35 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -39,7 +39,7 @@
name = "canvas"
desc = "Draw out your soul on this canvas!"
icon = 'icons/obj/artstuff.dmi'
- icon_state = "square"
+ icon_state = "11x11"
resistance_flags = FLAMMABLE
var/width = 11
var/height = 11
diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm
index 36b764590609..20986f9e6c27 100644
--- a/code/game/objects/structures/catwalk.dm
+++ b/code/game/objects/structures/catwalk.dm
@@ -54,7 +54,7 @@
/obj/structure/catwalk/examine(mob/user)
. = ..()
if(!(resistance_flags & INDESTRUCTIBLE))
- . += "The supporting rods look like they could be sliced . "
+ . += "The supporting rods look like they could be welded . "
/obj/structure/catwalk/attackby(obj/item/C, mob/user, params)
if(C.tool_behaviour == TOOL_WELDER && !(resistance_flags & INDESTRUCTIBLE))
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index ddde4a25af5d..a11e647a706d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -8,7 +8,6 @@
//WS Begin
new /obj/item/clothing/head/beret/ce(src) //Berets
new /obj/item/clothing/under/rank/command(src) //Better command uniforms
- new /obj/item/card/id/departmental_budget/eng(src) //Budger Cards
new /obj/item/stack/tape/industrial/pro(src) //Better tape
//WS End
new /obj/item/clothing/neck/cloak/ce(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/wallmount.dm b/code/game/objects/structures/crates_lockers/closets/wallmount.dm
index 2e0be1907ce4..301cfccc79d5 100644
--- a/code/game/objects/structures/crates_lockers/closets/wallmount.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wallmount.dm
@@ -6,105 +6,37 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "generic_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall, 28)
+
/obj/structure/closet/wall/red
icon_state = "sec_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/red, 28)
+
/obj/structure/closet/wall/orange
icon_state = "cargo_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/orange, 28)
+
/obj/structure/closet/wall/blue
icon_state = "solgov_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/blue, 28)
+
/obj/structure/closet/wall/white
icon_state = "freezer_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/white, 28)
+
/obj/structure/closet/wall/white/chem
icon_door = "chemical_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/chem, 28)
+
/obj/structure/closet/wall/white/med
icon_door = "med_wall"
-//wardrobes
-
-/obj/structure/closet/wardrobe/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "blue_wall"
-
-/obj/structure/closet/wardrobe/pink/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "pink_wall"
-
-/obj/structure/closet/wardrobe/black/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "black_wall"
-
-/obj/structure/closet/wardrobe/green/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "green_wall"
-
-/obj/structure/closet/wardrobe/orange/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "orange_wall"
-
-/obj/structure/closet/wardrobe/yellow/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "yellow_wall"
-
-/obj/structure/closet/wardrobe/white/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "white_wall"
-
-/obj/structure/closet/wardrobe/pjs/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "white_wall"
-
-/obj/structure/closet/wardrobe/grey/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "grey_wall"
-
-/obj/structure/closet/wardrobe/mixed/wall
- wall_mounted = TRUE
- anchored = TRUE
- density = TRUE
- can_be_unanchored = FALSE
- icon = 'icons/obj/wallcloset.dmi'
- icon_door = "mixed_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/med, 28)
//special
@@ -116,6 +48,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "fire_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/firecloset/wall, 28)
+
/obj/structure/closet/emcloset/wall
wall_mounted = TRUE
anchored = TRUE
@@ -124,6 +58,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "emergency_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/emcloset/wall, 28)
+
//secure closets/freezers
/obj/structure/closet/secure_closet/wall
wall_mounted = TRUE
@@ -133,6 +69,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "freezer_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/wall, 28)
+
/obj/structure/closet/secure_closet/freezer/wall
wall_mounted = TRUE
anchored = TRUE
@@ -141,6 +79,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "freezer_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/freezer/wall, 28)
+
/obj/structure/closet/secure_closet/freezer/kitchen/wall
wall_mounted = TRUE
anchored = TRUE
@@ -149,6 +89,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "freezer_wall"
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/freezer/kitchen/wall, 28)
+
/obj/structure/closet/secure_closet/brig/wall
wall_mounted = TRUE
anchored = TRUE
@@ -157,3 +99,5 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "generic_wall"
icon_door = "generic_wall"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/brig/wall, 28)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 4884a757453e..37c816335977 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -447,9 +447,7 @@
to_chat(usr, "You do not possess the funds to purchase this. ")
return TRUE
else
- account.adjust_money(-sale_price)
- if(payments_acc)
- payments_acc.adjust_money(sale_price)
+ payments_acc.transfer_money(account, sale_price)
usr.put_in_hands(showpiece)
to_chat(usr, "You purchase [showpiece] for [sale_price] credits. ")
playsound(src, 'sound/effects/cashregister.ogg', 40, TRUE)
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index b53379b4d0c4..6a53024a81a0 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -74,6 +74,7 @@
/obj/structure/fluff/bus
name = "bus"
desc = "GO TO SCHOOL. READ A BOOK."
+ icon_state = "backseat"
icon = 'icons/obj/bus.dmi'
density = TRUE
anchored = TRUE
@@ -126,6 +127,7 @@
/obj/structure/fluff/divine
name = "Miracle"
+ icon_state = "trap_rand"
icon = 'icons/obj/hand_of_god_structures.dmi'
anchored = TRUE
density = TRUE
@@ -179,15 +181,6 @@
density = TRUE
deconstructible = FALSE
-/obj/structure/fluff/beach_towel
- name = "beach towel"
- desc = "A towel decorated in various beach-themed designs."
- icon = 'icons/obj/fluff.dmi'
- icon_state = "railing"
- density = FALSE
- anchored = TRUE
- deconstructible = FALSE
-
/obj/structure/fluff/beach_umbrella
name = "beach umbrella"
desc = "A fancy umbrella designed to keep the sun off beach-goers."
@@ -215,6 +208,7 @@
/obj/structure/fluff/clockwork
name = "Clockwork Fluff"
icon = 'icons/obj/clockwork_objects.dmi'
+ icon_state = "rare_pepe" //This should never be seen and i just found out that its in this file for some reason
deconstructible = FALSE
/obj/structure/fluff/clockwork/alloy_shards
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 04aa590de74c..abc67e252d52 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -212,11 +212,14 @@
/obj/effect/mob_spawn/human/pirate/gunner
rank = "Gunner"
+/datum/outfit/syndicatespace
+ name = "Syndicate Spacer"
+ uniform = /obj/item/clothing/under/syndicate/combat
+ mask = /obj/item/clothing/mask/gas/syndicate
+
/datum/outfit/syndicatespace/syndicrew
name = "Syndicate Ship Crew Member"
- uniform = /obj/item/clothing/under/syndicate/combat
glasses = /obj/item/clothing/glasses/night
- mask = /obj/item/clothing/mask/gas/syndicate
ears = /obj/item/radio/headset/syndicate/alt
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
@@ -229,10 +232,8 @@
/datum/outfit/syndicatespace/syndicaptain
name = "Syndicate Ship Captain"
- uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
glasses = /obj/item/clothing/glasses/night
- mask = /obj/item/clothing/mask/gas/syndicate
head = /obj/item/clothing/head/HoS/beret/syndicate
ears = /obj/item/radio/headset/syndicate/alt/captain
shoes = /obj/item/clothing/shoes/combat
diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
index 9fc83f9ddc88..07ecef04afac 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -27,8 +27,6 @@ GLOBAL_LIST_INIT(ore_probability, list(
/obj/structure/spawner/ice_moon
name = "cave entrance"
desc = "A hole in the ground, filled with monsters ready to defend it."
- icon = 'icons/mob/nest.dmi'
- icon_state = "hole"
faction = list("mining")
max_mobs = 3
max_integrity = 250
@@ -316,7 +314,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /obj/item/reagent_containers/glass/bottle/potion/flight(loc)
new /mob/living/simple_animal/hostile/skeleton/templar(loc)
else
- new /obj/item/clothing/neck/necklace/memento_mori(loc)
+ new /obj/item/clothing/neck/memento_mori(loc)
new /mob/living/simple_animal/hostile/skeleton(loc)
new /mob/living/simple_animal/hostile/skeleton/templar(loc)
if(prob(35))
diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm
index a1ab48ba3c7b..ed177c72d34e 100644
--- a/code/game/objects/structures/lavaland/geyser.dm
+++ b/code/game/objects/structures/lavaland/geyser.dm
@@ -30,10 +30,7 @@
if(activated && reagents.total_volume <= reagents.maximum_volume) //this is also evaluated in add_reagent, but from my understanding proc calls are expensive
reagents.add_reagent(reagent_id, potency)
-/obj/structure/geyser/plunger_act(obj/item/plunger/P, mob/living/user, _reinforced)
- if(!_reinforced)
- to_chat(user, "The [P.name] isn't strong enough! ")
- return
+/obj/structure/geyser/plunger_act(obj/item/plunger/P, mob/living/user)
if(activated)
to_chat(user, "The [name] is already active! ")
return
@@ -61,10 +58,9 @@
custom_materials = list(/datum/material/iron = 150) // WS Edit - Item Materials
var/plunge_mod = 1 //time*plunge_mod = total time we take to plunge an object
- var/reinforced = FALSE //whether we do heavy duty stuff like geysers
/obj/item/plunger/attack_obj(obj/O, mob/living/user)
- if(!O.plunger_act(src, user, reinforced))
+ if(!O.plunger_act(src, user))
return ..()
/obj/item/plunger/throw_impact(atom/hit_atom, datum/thrownthing/tt)
@@ -77,12 +73,3 @@
H.equip_to_slot_if_possible(src, ITEM_SLOT_MASK)
H.visible_message("The plunger slams into [H]'s face! ", "The plunger suctions to your face! ")
-/obj/item/plunger/reinforced
- name = "reinforced plunger"
- desc = "It's an M. 7 Reinforced Plunger© for heavy duty plunging."
- icon_state = "reinforced_plunger"
-
- reinforced = TRUE
- plunge_mod = 0.8
-
- custom_premium_price = 1200
diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm
index 7a57d1d5ac3a..b3c9a8cbf230 100644
--- a/code/game/objects/structures/lavaland/necropolis_tendril.dm
+++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm
@@ -3,7 +3,6 @@
name = "necropolis tendril"
desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it."
- icon = 'icons/mob/nest.dmi'
icon_state = "tendril"
faction = list("mining")
diff --git a/code/game/objects/structures/radioactive.dm b/code/game/objects/structures/radioactive.dm
index 6dbc40b11e4e..87de907b1813 100644
--- a/code/game/objects/structures/radioactive.dm
+++ b/code/game/objects/structures/radioactive.dm
@@ -8,19 +8,18 @@
density = TRUE
var/rad_power = 100
var/rad_range = 1 // !Range mod = rad dropoff speed
- var/rad_delay = 20
- var/rad_prob = 30
- var/_pulse = 0 // Holds the world.time interval in process
+ COOLDOWN_DECLARE(pulse_cooldown)
+ var/rad_delay = 2 SECONDS
/obj/structure/radioactive/Initialize()
START_PROCESSING(SSobj, src)
. = ..()
/obj/structure/radioactive/process()
- if(world.time > _pulse)
- if(prob(rad_prob))
+ for(var/mob/living/L in range(5, src))
+ if(L.client)
Nuke()
- _pulse = world.time + rad_delay
+ break
..()
/obj/structure/radioactive/bullet_act(obj/projectile/P)
@@ -50,6 +49,10 @@
Nuke()
/obj/structure/radioactive/proc/Nuke(atom/movable/AM)
+ if(!COOLDOWN_FINISHED(src, pulse_cooldown))
+ return
+
+ COOLDOWN_START(src, pulse_cooldown, rad_delay)
radiation_pulse(src, rad_power, rad_range)
/obj/structure/radioactive/waste
@@ -59,7 +62,7 @@
anchored = TRUE
rad_power = 150
rad_range = 0.8
- rad_prob = 50
+ rad_delay = 1 SECONDS
/obj/structure/radioactive/stack
name = "stack of nuclear waste"
@@ -67,7 +70,7 @@
icon_state = "barrel_3"
anchored = TRUE
rad_power = 300
- rad_prob = 50
+ rad_delay = 1 SECONDS
/obj/structure/radioactive/supermatter
name = "decayed supermatter crystal"
@@ -76,5 +79,4 @@
anchored = TRUE
rad_power = 1200
rad_range = 0.2
- rad_delay = 20
- rad_prob = 60
+ rad_delay = 0.5 SECONDS
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
index 4f3bee0cff60..fa5c49260738 100644
--- a/code/game/objects/structures/salvaging.dm
+++ b/code/game/objects/structures/salvaging.dm
@@ -368,6 +368,7 @@
/obj/item/stack/ore/salvage
name = "salvage"
icon = 'icons/obj/salvage_structure.dmi'
+ icon_state = "smetal"
/obj/item/stack/ore/salvage/examine(mob/user)
. = ..()
@@ -376,8 +377,6 @@
/obj/item/stack/ore/salvage/scrapmetal
name = "scrap metal"
desc = "A collection of metal parts and pieces."
- icon_state = "smetal"
- item_state = "smetal"
points = 1
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
@@ -396,7 +395,6 @@
name = "scrap titanium"
desc = "Lightweight, rust-resistant parts and pieces from high-performance equipment."
icon_state = "stitanium"
- item_state = "stitanium"
points = 50
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT)
@@ -409,7 +407,6 @@
name = "worn crt"
desc = "An old CRT display with the letters 'STANDBY' burnt into the screen."
icon_state = "ssilver"
- item_state = "ssilver"
points = 16
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT)
@@ -422,7 +419,6 @@
name = "scrap electronics"
desc = "Various bits of electrical components."
icon_state = "sgold"
- item_state = "sgold"
points = 18
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT)
@@ -435,7 +431,6 @@
name = "junk plasma cell"
desc = "A nonfunctional plasma cell, once used as portable power generation."
icon_state = "splasma"
- item_state = "splasma"
points = 15
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT)
@@ -448,7 +443,6 @@
name = "broken detector"
desc = "The label on the side warns the reader of radioactive elements."
icon_state = "suranium"
- item_state = "suranium"
points = 30
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT)
@@ -461,7 +455,6 @@
name = "damaged bluespace circuit"
desc = "It's damaged beyond repair, but the crystal inside its housing looks fine."
icon_state = "sbluespace"
- item_state = "sbluespace"
points = 50
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/bluespace=MINERAL_MATERIAL_AMOUNT)
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
index 7832c878642a..a8652f130806 100644
--- a/code/game/objects/structures/signs/signs_flags.dm
+++ b/code/game/objects/structures/signs/signs_flags.dm
@@ -33,7 +33,7 @@
/obj/structure/sign/flag/gezena
name = "\improper Gezenan flag"
- desc = "lizards"
+ desc = "Gezena, the pride of the Pan-Gezenan Federation. Something about this flag makes you think of lizards."
icon_state = "flag_gezena"
item_flag = /obj/item/sign/flag/gezena
@@ -48,6 +48,6 @@
/obj/item/sign/flag/gezena
name = "folded Gezenan flag"
- desc = "lizards but folded"
+ desc = "A folded up Gezenan Flag. Something about this flag makes you think of plants."
icon_state = "folded_gezena"
sign_path = /obj/structure/sign/flag/gezena
diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm
index d9e715e38ca6..3f224abacbe8 100644
--- a/code/game/objects/structures/signs/signs_maps.dm
+++ b/code/game/objects/structures/signs/signs_maps.dm
@@ -3,6 +3,7 @@
/obj/structure/sign/map
name = "station map"
desc = "A navigational chart of the station."
+ icon_state = "map-left"
icon = 'icons/obj/structures/signs/directions.dmi'
max_integrity = 500
diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm
index 6929bb46cf19..9773221f0c22 100644
--- a/code/game/objects/structures/spawner.dm
+++ b/code/game/objects/structures/spawner.dm
@@ -26,7 +26,7 @@ GLOBAL_LIST_INIT(astroloot, list(
/obj/structure/spawner
name = "monster nest"
- icon = 'icons/mob/animal.dmi'
+ icon = 'icons/mob/nest.dmi'
icon_state = "hole"
max_integrity = 100
@@ -65,8 +65,6 @@ GLOBAL_LIST_INIT(astroloot, list(
/obj/structure/spawner/skeleton
name = "bone pit"
desc = "A pit full of bones, and some still seem to be moving..."
- icon_state = "hole"
- icon = 'icons/mob/nest.dmi'
max_integrity = 150
max_mobs = 15
spawn_time = 150
@@ -105,9 +103,7 @@ GLOBAL_LIST_INIT(astroloot, list(
/obj/structure/spawner/mining
name = "monster den"
desc = "A hole dug into the ground, harboring all kinds of monsters found within most caves or mining asteroids."
- icon_state = "hole"
max_mobs = 3
- icon = 'icons/mob/nest.dmi'
spawn_text = "crawls out of"
mob_types = list(/mob/living/simple_animal/hostile/asteroid/goldgrub, /mob/living/simple_animal/hostile/asteroid/goliath, /mob/living/simple_animal/hostile/asteroid/hivelord, /mob/living/simple_animal/hostile/asteroid/basilisk, /mob/living/simple_animal/hostile/asteroid/fugu)
faction = list("mining")
diff --git a/code/game/objects/structures/table_flipped.dm b/code/game/objects/structures/table_flipped.dm
index 5047e0f3e2a9..c006695a7df0 100644
--- a/code/game/objects/structures/table_flipped.dm
+++ b/code/game/objects/structures/table_flipped.dm
@@ -2,7 +2,7 @@
name = "flipped table"
desc = "A flipped table."
icon = 'icons/obj/flipped_tables.dmi'
- icon_state = "metal-flipped"
+ icon_state = "table"
anchored = TRUE
density = TRUE
layer = ABOVE_MOB_LAYER
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 5882d5c382cd..2257a3c10c3a 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -465,61 +465,51 @@
icon = smooth_icon
/obj/structure/table/wood/fancy/black
- icon_state = "fancy_table_black"
base_icon_state = "fancy_table_black"
buildstack = /obj/item/stack/tile/carpet/black
smooth_icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
/obj/structure/table/wood/fancy/blue
- icon_state = "fancy_table_blue"
base_icon_state = "fancy_table_blue"
buildstack = /obj/item/stack/tile/carpet/blue
smooth_icon = 'icons/obj/smooth_structures/fancy_table_blue.dmi'
/obj/structure/table/wood/fancy/cyan
- icon_state = "fancy_table_cyan"
base_icon_state = "fancy_table_cyan"
buildstack = /obj/item/stack/tile/carpet/cyan
smooth_icon = 'icons/obj/smooth_structures/fancy_table_cyan.dmi'
/obj/structure/table/wood/fancy/green
- icon_state = "fancy_table_green"
base_icon_state = "fancy_table_green"
buildstack = /obj/item/stack/tile/carpet/green
smooth_icon = 'icons/obj/smooth_structures/fancy_table_green.dmi'
/obj/structure/table/wood/fancy/orange
- icon_state = "fancy_table_orange"
base_icon_state = "fancy_table_orange"
buildstack = /obj/item/stack/tile/carpet/orange
smooth_icon = 'icons/obj/smooth_structures/fancy_table_orange.dmi'
/obj/structure/table/wood/fancy/purple
- icon_state = "fancy_table_purple"
base_icon_state = "fancy_table_purple"
buildstack = /obj/item/stack/tile/carpet/purple
smooth_icon = 'icons/obj/smooth_structures/fancy_table_purple.dmi'
/obj/structure/table/wood/fancy/red
- icon_state = "fancy_table_red"
base_icon_state = "fancy_table_red"
buildstack = /obj/item/stack/tile/carpet/red
smooth_icon = 'icons/obj/smooth_structures/fancy_table_red.dmi'
/obj/structure/table/wood/fancy/royalblack
- icon_state = "fancy_table_royalblack"
base_icon_state = "fancy_table_royalblack"
buildstack = /obj/item/stack/tile/carpet/royalblack
smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblack.dmi'
/obj/structure/table/wood/fancy/royalblue
- icon_state = "fancy_table_royalblue"
base_icon_state = "fancy_table_royalblue"
buildstack = /obj/item/stack/tile/carpet/royalblue
smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblue.dmi'
/obj/structure/table/wood/fancy/red_gold
- icon_state = "fancy_table_red"
base_icon_state = "fancy_table_red"
buildstack = /obj/item/stack/tile/carpet/red_gold
smooth_icon = 'icons/obj/smooth_structures/fancy_table_red.dmi'
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 77cb9c3a7b67..0d1407167472 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -269,7 +269,6 @@
/obj/structure/transit_tube/station/dispenser/reverse
tube_construction = /obj/structure/c_transit_tube/station/dispenser/reverse
reverse_launch = TRUE
- icon_state = "closed_terminusdispenser0"
base_icon = "terminusdispenser0"
/obj/structure/transit_tube/station/dispenser/reverse/init_tube_dirs()
@@ -285,7 +284,6 @@
boarding_dir = turn(dir, 180)
/obj/structure/transit_tube/station/dispenser/reverse/flipped
- icon_state = "closed_terminusdispenser1"
base_icon = "terminusdispenser1"
tube_construction = /obj/structure/c_transit_tube/station/dispenser/reverse/flipped
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
index f3ea6d55a1da..b74ba4fce82d 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -85,13 +85,11 @@
//all the dispenser stations
/obj/structure/c_transit_tube/station/dispenser
- icon_state = "closed_dispenser0"
name = "unattached dispenser station"
build_type = /obj/structure/transit_tube/station/dispenser
flipped_build_type = /obj/structure/transit_tube/station/dispenser/flipped
/obj/structure/c_transit_tube/station/dispenser/flipped
- icon_state = "closed_station1"
flipped = 1
build_type = /obj/structure/transit_tube/station/dispenser/flipped
flipped_build_type = /obj/structure/transit_tube/station/dispenser
@@ -100,13 +98,11 @@
/obj/structure/c_transit_tube/station/dispenser/reverse
name = "unattached terminus dispenser station"
- icon_state = "closed_terminus0"
build_type = /obj/structure/transit_tube/station/dispenser/reverse
flipped_build_type = /obj/structure/transit_tube/station/dispenser/reverse/flipped
base_icon = "closed_terminus"
/obj/structure/c_transit_tube/station/dispenser/reverse/flipped
- icon_state = "closed_terminus1"
flipped = 1
build_type = /obj/structure/transit_tube/station/dispenser/reverse/flipped
flipped_build_type = /obj/structure/transit_tube/station/dispenser/reverse
diff --git a/code/game/say.dm b/code/game/say.dm
index 306ad62fefdc..c3c8dca852f8 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -7,6 +7,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_NANOTRASEN]" = "ntradio",
"[FREQ_MINUTEMEN]" = "clipradio",
"[FREQ_INTEQ]" = "irmgradio",
+ "[FREQ_PGF]" = "pgfradio",
"[FREQ_PIRATE]" = "pirradio",
"[FREQ_COMMAND]" = "comradio",
"[FREQ_AI_PRIVATE]" = "aiprivradio",
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index 5ee0df0ec0f5..e427bfb6d46c 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -289,26 +289,6 @@
SSevents.toggleWizardmode()
SSevents.resetFrequency()
SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Summon Events", "Disable"))
- if("eagles")
- if(!is_funmin)
- return
- SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Egalitarian Station"))
- for(var/obj/machinery/door/airlock/W in GLOB.machines)
- var/area/airlock_area = get_area(W)
- if(istype(airlock_area, /area/ship) && !istype(airlock_area, /area/ship/bridge) && !istype(airlock_area, /area/ship/crew) && !istype(airlock_area, /area/ship/security/prison))
- W.req_access = list()
- message_admins("[key_name_admin(holder)] activated Egalitarian Station mode")
- priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')
- if("ancap")
- if(!is_funmin)
- return
- SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Anarcho-capitalist Station"))
- SSeconomy.full_ancap = !SSeconomy.full_ancap
- message_admins("[key_name_admin(holder)] toggled Anarcho-capitalist mode")
- if(SSeconomy.full_ancap)
- priority_announce("The NAP is now in full effect.", null, 'sound/ai/commandreport.ogg')
- else
- priority_announce("The NAP has been revoked.", null, 'sound/ai/commandreport.ogg')
if("blackout")
if(!is_funmin)
return
diff --git a/code/modules/antagonists/changeling/cellular_emporium.dm b/code/modules/antagonists/changeling/cellular_emporium.dm
index 9b0fc416abc0..ab0c4c28bb41 100644
--- a/code/modules/antagonists/changeling/cellular_emporium.dm
+++ b/code/modules/antagonists/changeling/cellular_emporium.dm
@@ -74,7 +74,7 @@
/datum/action/innate/cellular_emporium
name = "Cellular Emporium"
- icon_icon = 'icons/obj/drinks.dmi'
+ icon_icon = 'icons/obj/drinks/drinks.dmi'
button_icon_state = "changelingsting"
background_icon_state = "bg_changeling"
var/datum/cellular_emporium/cellular_emporium
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 58714f234ee8..d77c4ef6ff3c 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -273,7 +273,7 @@
desc = "A tentacle."
projectile_type = /obj/projectile/tentacle
caliber = "tentacle"
- icon_state = "tentacle_end"
+ icon_state = "arrow"
firing_effect_type = null
var/obj/item/gun/magic/tentacle/gun //the item that shot it
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 7d0e9f7a4346..6eed283b02f1 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -470,7 +470,7 @@
/obj/item/reagent_containers/glass/beaker/unholywater
name = "flask of unholy water"
desc = "Toxic to nonbelievers; reinvigorating to the faithful - this flask may be sipped or thrown."
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "holyflask"
color = "#333333"
list_reagents = list(/datum/reagent/fuel/unholywater = 50)
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index 5bf8f9dc2779..66526d96a34f 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -100,7 +100,7 @@
var/list/items = list(
"Eldritch Whetstone" = image(icon = 'icons/obj/kitchen.dmi', icon_state = "cult_sharpener"),
"Construct Shell" = image(icon = 'icons/obj/wizard.dmi', icon_state = "construct_cult"),
- "Flask of Unholy Water" = image(icon = 'icons/obj/drinks.dmi', icon_state = "holyflask")
+ "Flask of Unholy Water" = image(icon = 'icons/obj/drinks/drinks.dmi', icon_state = "holyflask")
)
var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
var/list/pickedtype = list()
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
index d012949ba054..a6edcb075361 100644
--- a/code/modules/antagonists/traitor/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/syndicate_contract.dm
@@ -124,6 +124,7 @@
// This is slightly delayed because of the sleep calls above to handle the narrative.
// We don't want to tell the station instantly.
+ /*
var/points_to_check
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
@@ -135,6 +136,7 @@
priority_announce("One of your crew was captured by a rival organisation - we've needed to pay their ransom to bring them back. \
As is policy we've taken a portion of the station's funds to offset the overall cost.", null, 'sound/ai/attention.ogg', null, "Nanotrasen Asset Protection")
+ */
sleep(30)
@@ -147,7 +149,7 @@
C = H.get_idcard(TRUE)
if(C && C.registered_account)
- C.registered_account.adjust_money(ransom * 0.35)
+ C.registered_account.adjust_money(ransom * 0.35, "syndicate_contract")
C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \
[C.registered_account.account_balance] cr.", TRUE)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
index eff2a0525230..8445257585ab 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/components/binary/temperature_pump
- icon_state = "tpump_map-3"
+ icon_state = "tpump_on_map-3"
name = "temperature pump"
desc = "A pump that moves heat from one pipeline to another. The input will get cooler, and the output will get hotter."
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 3cbd43897878..03b41df05e32 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -198,7 +198,7 @@
/obj/machinery/atmospherics/components/binary/volume_pump/on
on = TRUE
- icon_state = "volpump_on_map"
+ icon_state = "volpump_map-2"
/obj/machinery/atmospherics/components/binary/volume_pump/on/layer2
piping_layer = 2
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
index c21aaf7ccd79..c1ce88286b4c 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
@@ -212,7 +212,7 @@
icon_state = "mixer_on_f_map-2"
/obj/machinery/atmospherics/components/trinary/mixer/flipped/on/layer4
piping_layer = 4
- icon_state = "mixer_on_f_map-4"
+ icon_state = "mixer_on_f_map-2"
/obj/machinery/atmospherics/components/trinary/mixer/airmix //For standard airmix to distro
name = "air mixer"
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
index 59e63dd14e24..5d0d5b775b4f 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
@@ -46,7 +46,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/layer1
piping_layer = 1
- icon_state = "connector_map-1"
+ icon_state = "connector_map-2"
/obj/machinery/atmospherics/components/unary/portables_connector/layer2
piping_layer = 2
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 3a878409d0e2..7a2559724ad1 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -312,7 +312,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/layer1
piping_layer = 1
- icon_state = "vent_map-1"
+ icon_state = "vent_map-2"
/obj/machinery/atmospherics/components/unary/vent_pump/layer2
piping_layer = 2
@@ -328,7 +328,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1
piping_layer = 1
- icon_state = "vent_map_on-1"
+ icon_state = "vent_map_on-2"
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2
piping_layer = 2
@@ -358,7 +358,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer1
piping_layer = 1
- icon_state = "vent_map_siphon_on-1"
+ icon_state = "vent_map_siphon_on-2"
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer2
piping_layer = 2
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 0e5e7dc1c74a..c55b8da80436 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -276,7 +276,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer1
piping_layer = 1
- icon_state = "scrub_map-1"
+ icon_state = "scrub_map-2"
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2
piping_layer = 2
@@ -292,7 +292,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1
piping_layer = 1
- icon_state = "scrub_map_on-1"
+ icon_state = "scrub_map_on-2"
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2
piping_layer = 2
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index daf7299ca970..2f87eea6d2a7 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -130,7 +130,7 @@
/obj/effect/ctf/flag_reset
name = "banner landmark"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/banner.dmi'
icon_state = "banner"
desc = "This is where a banner with Nanotrasen's logo on it would go."
layer = LOW_ITEM_LAYER
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index a4b9098c77a1..6f28cc724b55 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -79,8 +79,6 @@
name = "The Lens of Truesight"
desc = "I can see forever!"
icon_state = "monocle"
- item_state = "headset"
-
/obj/structure/academy_wizard_spawner
name = "Academy Defensive System"
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index 255c4bce7f78..01efd57be70b 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
// Called when the claim button is clicked. Override to provide fancy rewards.
/datum/bounty/proc/claim(datum/bank_account/claimer_account)
if(can_claim() && claimer_account)
- claimer_account.adjust_money(reward)
+ claimer_account.adjust_money(reward, "bounty")
claimed = TRUE
// If an item sent in the cargo shuttle can satisfy the bounty.
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index b6920bb419bf..cd1946265374 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -16,7 +16,7 @@
/obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/voodoo,
/obj/item/grenade/clusterbuster/inferno,
- /obj/item/clothing/neck/necklace/memento_mori,
+ /obj/item/clothing/neck/memento_mori,
/obj/item/organ/heart/cursed/wizard,
/obj/item/clothing/suit/hooded/cloak/drake,
/obj/item/dragons_blood,
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index 9f615a5ba3ee..81409d63d031 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -65,13 +65,7 @@
return ..()
/obj/machinery/computer/cargo/express/attackby(obj/item/W, mob/living/user, params)
- var/value = 0
- if(istype(W, /obj/item/spacecash/bundle))
- var/obj/item/spacecash/bundle/C = W
- value = C.value
- else if(istype(W, /obj/item/holochip))
- var/obj/item/holochip/H = W
- value = H.credits
+ var/value = W.get_item_credit_value()
if(value && charge_account)
charge_account.adjust_money(value)
to_chat(user, "You deposit [W]. The Vessel Budget is now [charge_account.account_balance] cr. ")
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 3ff822a4f943..ab737b1ceb78 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -471,7 +471,7 @@
/obj/effect/engineglow //Falling pod smoke
name = ""
icon = 'icons/obj/supplypods.dmi'
- icon_state = "pod_engineglow"
+ icon_state = "pod_glow_yellow"
desc = ""
layer = GASFIRE_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm
index fe9d68635a2e..72d29ce55b56 100644
--- a/code/modules/clothing/ears/_ears.dm
+++ b/code/modules/clothing/ears/_ears.dm
@@ -2,6 +2,8 @@
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
+ lefthand_file = 'icons/mob/inhands/clothing/ears_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/ears_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
throwforce = 0
slot_flags = ITEM_SLOT_EARS
diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm
index 5dd227a4d323..b6b0839509fa 100644
--- a/code/modules/clothing/factions/gezena.dm
+++ b/code/modules/clothing/factions/gezena.dm
@@ -86,12 +86,14 @@
desc = "Raksha - a Kalixcian word for 'protection of the heart'. Sturdy and reliable."
icon_state = "marinevest"
item_state = "marinevest"
+ armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //the laser gun country should probably have laser armor
/obj/item/clothing/suit/armor/gezena/marinecoat
name = "coated Raksha-plating"
desc = "Less practical with the coat than without."
icon_state = "marinecoat"
item_state = "bluecloth"
+ armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //same
//Spacesuits
@@ -151,6 +153,18 @@
icon_state = "marineflap"
item_state = "marinecloth"
+/obj/item/clothing/head/gezena/marine/lead
+ name = "\improper PGFMC Commander Cap"
+ desc = "The standard cap of the PGF military, in Marine Corps colors. The silver markings denote it as a commander's cap."
+ icon_state = "squadhat"
+ item_state = "marinecloth"
+
+/obj/item/clothing/head/gezena/marine/lead/flap
+ name = "\improper PGFMC Commander's' Betzu-il cap"
+ desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The silver markings denote it as a commander's cap."
+ icon_state = "squadflap"
+ item_state = "marinecloth"
+
/obj/item/clothing/head/gezena/medic
name = "\improper PGF medic cap"
desc = "The standard cap of the PGF military. The coloring indicates the wearer as a medical officer."
@@ -176,6 +190,7 @@
mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi'
righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
+ armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //the laser gun country should probably have laser armor
icon_state = "marinehelmet"
item_state = "marinehelm"
@@ -187,7 +202,6 @@
icon = 'icons/obj/clothing/faction/gezena/hands.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/gezena/hands.dmi'
icon_state = "navalgloves"
- item_state = "navalgloves"
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
@@ -196,21 +210,18 @@
name = "\improper PGFMC Ihuz-irra Gloves"
desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Carries extra tactile grip on the fingertips for easy use of firearms."
icon_state = "marinegloves"
- item_state = "marinegloves"
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50)
/obj/item/clothing/gloves/gezena/engi
name = "\improper PGFN Engineering Ihuz-irra Gloves"
desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Comes with anti-conductive microfibers interwoven to supply the useer with electrical insulation."
icon_state = "engigloves"
- item_state = "engigloves"
siemens_coefficient = 0
/obj/item/clothing/gloves/gezena/captain
name = "\improper PGFN Captain's Ihuz-irra Gloves"
desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Bears the silver standard of a Gezenan captain."
icon_state = "captaingloves"
- item_state = "captaingloves"
siemens_coefficient = 0
//Boots
@@ -221,7 +232,7 @@
icon = 'icons/obj/clothing/faction/gezena/feet.dmi'
//mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi' todo: find out why digi breaks here
icon_state = "pgfboots"
- item_state = "pgfboots"
+ item_state = "jackboots"
//Belt
@@ -234,6 +245,7 @@
righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi'
icon_state = "pouches"
item_state = "bluecloth"
+ unique_reskin = null
/obj/item/storage/belt/medical/gezena
name = "\improper PGF Medical Iho-Usks"
@@ -257,6 +269,12 @@
icon_state = "cape"
item_state = "blackcloth"
+/obj/item/clothing/neck/cloak/gezena/lead
+ name = "sergeant's Azuilhauz"
+ desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a squad commander."
+ icon_state = "squadcape"
+ item_state = "blackcloth"
+
/obj/item/clothing/neck/cloak/gezena/engi
name = "engineering Aziulhauz"
desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer with an engineering specialization."
@@ -267,10 +285,16 @@
name = "medical Aziulhauz"
desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer with a medical specialization."
icon_state = "medcape"
- item_state = "blackcloth"
+ item_state = "whitecloth"
-/obj/item/clothing/neck/cloak/gezena/captain
+/obj/item/clothing/neck/cloak/gezena/command
name = "officer's Azuilhauz"
+ desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer."
+ icon_state = "commandcape"
+ item_state = "whitecloth"
+
+/obj/item/clothing/neck/cloak/gezena/captain
+ name = "captain's Azuilhauz"
desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a high ranking officer."
icon_state = "captaincape"
- item_state = "blackcloth"
+ item_state = "whitecloth"
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 70a9fe677263..f33a789156e9 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -2,6 +2,8 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
flags_cover = GLASSESCOVERSEYES
slot_flags = ITEM_SLOT_EYES
@@ -165,7 +167,6 @@
name = "monocle"
desc = "Such a dapper eyepiece!"
icon_state = "monocle"
- item_state = "headset" // lol
supports_variations = VOX_VARIATION
/obj/item/clothing/glasses/material
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index 05ec517c4afc..afeb37e30c8b 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -161,7 +161,7 @@
/obj/item/clothing/glasses/meson/sunglasses
name = "optical meson scannerglasses"
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This pair is built into a pair of sunglasses."
- icon_state = "sunnmeson"
+ icon_state = "sunmeson"
flash_protect = FLASH_PROTECTION_FLASH
#undef MODE_NONE
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index b267db209293..385baa647432 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -212,7 +212,7 @@
/obj/item/clothing/glasses/hud/toggle/thermal
name = "thermal HUD scanner"
desc = "Thermal imaging HUD in the shape of glasses."
- icon_state = "thermal"
+ icon_state = "thermalgoggles"
hud_type = DATA_HUD_SECURITY_ADVANCED
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
@@ -222,13 +222,13 @@
..()
switch (hud_type)
if (DATA_HUD_MEDICAL_ADVANCED)
- icon_state = "meson"
+ icon_state = "mesongoggles"
change_glass_color(user, /datum/client_colour/glass_colour/green)
if (DATA_HUD_SECURITY_ADVANCED)
- icon_state = "thermal"
+ icon_state = "thermalgoggles"
change_glass_color(user, /datum/client_colour/glass_colour/red)
else
- icon_state = "purple"
+ icon_state = "scigoggles"
change_glass_color(user, /datum/client_colour/glass_colour/purple)
user.update_inv_glasses()
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index 8db83c860da7..61c06125d8f8 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -1,8 +1,11 @@
/obj/item/clothing/gloves
name = "gloves"
+ lefthand_file = 'icons/mob/inhands/clothing/gloves_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/gloves_righthand.dmi'
gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/clothing/gloves.dmi'
+ item_state = "bgloves"
siemens_coefficient = 0.5
body_parts_covered = HANDS
slot_flags = ITEM_SLOT_GLOVES
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index 68f64cdd515e..e2807b48dcf1 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -2,18 +2,15 @@
name = "boxing gloves"
desc = "Because you really needed another excuse to punch your crewmates."
icon_state = "boxing"
- item_state = "boxing"
equip_delay_other = 60
supports_variations = VOX_VARIATION
/obj/item/clothing/gloves/boxing/green
icon_state = "boxinggreen"
- item_state = "boxinggreen"
/obj/item/clothing/gloves/boxing/blue
icon_state = "boxingblue"
- item_state = "boxingblue"
/obj/item/clothing/gloves/boxing/yellow
icon_state = "boxingyellow"
- item_state = "boxingyellow"
+ item_state = "ygloves"
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 291b1c1b25b6..06bd05a45795 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -38,7 +38,6 @@
desc = "How're you gonna get 'em off, nerd?"
name = "spray-on insulated gloves"
icon_state = "sprayon"
- item_state = "sprayon"
permeability_coefficient = 0
resistance_flags = ACID_PROOF
var/shocks_remaining = 10
@@ -64,7 +63,7 @@
name = "taped-on insulated gloves"
desc = "This is a totally safe idea."
icon_state = "yellowtape"
- item_state = "ygloves"
+ mob_overlay_state = "sprayon"
shocks_remaining = 3
/obj/item/clothing/gloves/color/yellow/sprayon/tape/Initialize()
@@ -109,7 +108,6 @@
desc = "These gloves are fire-resistant."
name = "black gloves"
icon_state = "black"
- item_state = "blackgloves"
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
@@ -130,14 +128,11 @@
name = "orange gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "orange"
- item_state = "orangegloves"
/obj/item/clothing/gloves/color/red
name = "red gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "red"
- item_state = "redgloves"
-
/obj/item/clothing/gloves/color/red/insulated
name = "insulated gloves"
@@ -150,49 +145,41 @@
name = "rainbow gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "rainbow"
- item_state = "rainbowgloves"
/obj/item/clothing/gloves/color/blue
name = "blue gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "blue"
- item_state = "bluegloves"
/obj/item/clothing/gloves/color/purple
name = "purple gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "purple"
- item_state = "purplegloves"
/obj/item/clothing/gloves/color/green
name = "green gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "green"
- item_state = "greengloves"
/obj/item/clothing/gloves/color/grey
name = "grey gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "gray"
- item_state = "graygloves"
/obj/item/clothing/gloves/color/light_brown
name = "light brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "lightbrown"
- item_state = "lightbrowngloves"
/obj/item/clothing/gloves/color/brown
name = "brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "brown"
- item_state = "browngloves"
/obj/item/clothing/gloves/color/captain
desc = "Regal white gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
name = "captain's gloves"
icon_state = "captain"
- item_state = "egloves"
siemens_coefficient = 0
permeability_coefficient = 0.05
cold_protection = HANDS
@@ -206,13 +193,12 @@
desc = "Regal blue gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
name = "captain's gloves"
icon_state = "captainnt"
- item_state = "egloves"
/obj/item/clothing/gloves/color/latex
name = "latex gloves"
desc = "Cheap sterile gloves made from latex. Transfers minor paramedic knowledge to the user via budget nanochips."
icon_state = "latex"
- item_state = "latex"
+ item_state = "lgloves"
siemens_coefficient = 0.3
permeability_coefficient = 0.01
transfer_prints = TRUE
@@ -232,7 +218,6 @@
name = "nitrile gloves"
desc = "Pricy sterile gloves that are thicker than latex. Transfers intimate paramedic knowledge into the user via nanochips."
icon_state = "nitrile"
- item_state = "nitrilegloves"
transfer_prints = FALSE
carrytrait = TRAIT_QUICKER_CARRY
supports_variations = KEPORI_VARIATION
@@ -241,13 +226,11 @@
name = "red nitrile gloves"
desc = "Thick sterile gloves that reach up to the elbows, in exactly the same color as fresh blood. Transfers combat medic knowledge into the user via nanochips."
icon_state = "nitrile_evil"
- item_state = "nitrile_evil"
/obj/item/clothing/gloves/color/latex/nitrile/infiltrator
name = "infiltrator gloves"
desc = "Specialized combat gloves for carrying people around. Transfers tactical kidnapping knowledge into the user via nanochips."
icon_state = "infiltrator"
- item_state = "infiltrator"
siemens_coefficient = 0
permeability_coefficient = 0.3
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -257,7 +240,6 @@
desc = "Overdesigned engineering gloves that have automated construction subrutines dialed in, allowing for faster construction while worn."
icon = 'icons/obj/clothing/clockwork_garb.dmi'
icon_state = "clockwork_gauntlets"
- item_state = "clockwork_gauntlets"
siemens_coefficient = 0 //WS Station eddit "Tinkers Gloves Insuls"
permeability_coefficient = 0.05 //WS Station eddit "Tinkers Gloves Insuls"
//siemens_coefficient = 0.8 WS Station eddit "Tinkers Gloves Insuls"
@@ -269,14 +251,14 @@
name = "white gloves"
desc = "These look pretty fancy."
icon_state = "white"
- item_state = "wgloves"
+ item_state = "lgloves"
custom_price = 200
/obj/item/clothing/gloves/color/evening
name = "evening gloves"
desc = "White satin gloves that rise up to the elbows. Excessively fancy."
icon_state = "evening_gloves"
- item_state = "evening_gloves"
+ item_state = "lgloves"
custom_price = 200
/obj/effect/spawner/lootdrop/gloves
@@ -300,3 +282,4 @@
name = "maid arm covers"
desc = "Cylindrical looking tubes that go over your arm, weird."
icon_state = "maid_arms"
+ item_state = "lgloves"
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index d402847a613e..314af8aaf44a 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -3,7 +3,6 @@
name = "fingerless gloves"
desc = "Plain black gloves without fingertips for the hard working."
icon_state = "fingerless"
- item_state = "fingerless"
transfer_prints = TRUE
strip_delay = 40
equip_delay_other = 20
@@ -30,7 +29,6 @@
name = "combat gloves"
desc = "These tactical gloves are fireproof and electrically insulated."
icon_state = "combat"
- item_state = "combat"
siemens_coefficient = 0
permeability_coefficient = 0.05
strip_delay = 80
@@ -46,19 +44,16 @@
name = "combat maid sleeves"
desc = "These 'tactical' gloves and sleeves are fireproof and electrically insulated. Warm to boot."
icon_state = "syndimaid_arms"
- item_state = "syndimaid_arms"
/obj/item/clothing/gloves/combat/maid/inteq
name = "inteq combat maid sleeves"
desc = "Tacticute and comfy, along with being both fireproof and electrically insulated."
icon_state = "inteqmaid_arms"
- item_state = "inteqmaid_arms"
/obj/item/clothing/gloves/bracer
name = "bone bracers"
desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms."
icon_state = "bracers"
- item_state = "bracers"
transfer_prints = TRUE
strip_delay = 40
equip_delay_other = 20
@@ -73,7 +68,6 @@
name = "Gloves of the North Star"
desc = "Just looking at these fills you with an urge to beat the shit out of people."
icon_state = "rapid"
- item_state = "rapid"
transfer_prints = TRUE
cuttable = FALSE
@@ -86,7 +80,6 @@
desc = "Covers up those scandalous boney hands."
name = "plasma envirogloves"
icon_state = "plasmaman"
- item_state = "plasmaman"
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
@@ -98,65 +91,56 @@
/obj/item/clothing/gloves/color/plasmaman/black
name = "black envirogloves"
icon_state = "blackplasma"
- item_state = "blackplasma"
/obj/item/clothing/gloves/color/plasmaman/white
name = "white envirogloves"
icon_state = "whiteplasma"
- item_state = "whiteplasma"
+ item_state = "lgloves"
/obj/item/clothing/gloves/color/plasmaman/robot
name = "roboticist envirogloves"
icon_state = "robotplasma"
- item_state = "robotplasma"
/obj/item/clothing/gloves/color/plasmaman/janny
name = "janitor envirogloves"
icon_state = "jannyplasma"
- item_state = "jannyplasma"
/obj/item/clothing/gloves/color/plasmaman/cargo
name = "cargo envirogloves"
icon_state = "cargoplasma"
- item_state = "cargoplasma"
/obj/item/clothing/gloves/color/plasmaman/engineer
name = "engineering envirogloves"
icon_state = "engieplasma"
- item_state = "engieplasma"
+ item_state = "ygloves"
siemens_coefficient = 0
/obj/item/clothing/gloves/color/plasmaman/atmos
name = "atmos envirogloves"
icon_state = "atmosplasma"
- item_state = "atmosplasma"
+ item_state = "ygloves"
siemens_coefficient = 0
/obj/item/clothing/gloves/color/plasmaman/explorer
name = "explorer envirogloves"
icon_state = "explorerplasma"
- item_state = "explorerplasma"
/obj/item/clothing/gloves/color/botanic_leather/plasmaman
name = "botany envirogloves"
desc = "Covers up those scandalous boney hands."
icon_state = "botanyplasma"
- item_state = "botanyplasma"
permeability_coefficient = 0.05
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
/obj/item/clothing/gloves/color/plasmaman/prototype
name = "prototype envirogloves"
icon_state = "protoplasma"
- item_state = "protoplasma"
/obj/item/clothing/gloves/color/plasmaman/clown
name = "clown envirogloves"
icon_state = "clownplasma"
- item_state = "clownplasma"
/obj/item/clothing/gloves/combat/wizard
name = "enchanted gloves"
desc = "These gloves have been enchanted with a spell that makes them electrically insulated and fireproof."
icon_state = "wizard"
- item_state = "purplegloves"
diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm
index 58bee929a0d7..0ae7f48089e9 100644
--- a/code/modules/clothing/gloves/tacklers.dm
+++ b/code/modules/clothing/gloves/tacklers.dm
@@ -2,7 +2,6 @@
name = "gripper gloves"
desc = "Special gloves that manipulate the blood vessels in the wearer's hands, granting them the ability to launch headfirst into walls."
icon_state = "tackle"
- item_state = "tackle"
transfer_prints = TRUE
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
@@ -43,8 +42,6 @@
name = "dolphin gloves"
desc = "Sleek, aerodynamic gripper gloves that are less effective at actually performing takedowns, but more effective at letting the user sail through the hallways and cause accidents."
icon_state = "tackledolphin"
- item_state = "tackledolphin"
-
tackle_stam_cost = 15
base_knockdown = 0.5 SECONDS
tackle_range = 5
@@ -56,13 +53,10 @@
name = "gorilla gloves"
desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!"
icon_state = "black"
- item_state = "blackgloves"
-
tackle_stam_cost = 35
base_knockdown = 1.5 SECONDS
tackle_range = 5
skill_mod = 2
-
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
@@ -73,7 +67,6 @@
name = "guerrilla gloves"
desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
icon_state = "combat"
- item_state = "combat"
siemens_coefficient = 0
permeability_coefficient = 0.05
@@ -81,8 +74,6 @@
name = "rocket gloves"
desc = "The ultimate in high risk, high reward, perfect for when you need to stop a criminal from fifty feet away or die trying. Banned in most Spinward gridiron football and rugby leagues."
icon_state = "tacklerocket"
- item_state = "tacklerocket"
-
tackle_stam_cost = 50
base_knockdown = 2 SECONDS
tackle_range = 10
@@ -94,8 +85,6 @@
name = "improvised gripper gloves"
desc = "Ratty looking fingerless gloves wrapped with sticky tape. Beware anyone wearing these, for they clearly have no shame and nothing to lose."
icon_state = "fingerless"
- item_state = "fingerless"
-
tackle_stam_cost = 30
base_knockdown = 1.75 SECONDS
min_distance = 2
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index 11deb4ac8b53..4039402588fd 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -1,7 +1,9 @@
/obj/item/clothing/head
name = BODY_ZONE_HEAD
icon = 'icons/obj/clothing/hats.dmi'
- icon_state = "top_hat"
+ lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi'
+ icon_state = "tophat"
item_state = "that"
body_parts_covered = HEAD
slot_flags = ITEM_SLOT_HEAD
diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm
index 30a291dcb327..f8b542f40b9f 100644
--- a/code/modules/clothing/head/berets.dm
+++ b/code/modules/clothing/head/berets.dm
@@ -193,26 +193,22 @@
name = "\improper SolGov beret"
desc = "A beret with SolGov's emblem emblazoned on it. Colored in SolGov blue."
icon_state = "beret_solgov"
- item_state = "beret_solgov"
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60)
/obj/item/clothing/head/beret/solgov/plain
name = "\improper SolGov beret"
desc = "A plain blue beret. It looks like it's missing something."
icon_state = "beret_solgovplain"
- item_state = "beret_solgovplain"
/obj/item/clothing/head/beret/solgov/terragov
name = "\improper TerraGov beret"
desc = "A beret with SolGov's emblem emblazoned on it. It's still colored in original TerraGov green."
icon_state = "beret_terragov"
- item_state = "beret_terragov"
/obj/item/clothing/head/beret/solgov/terragov/plain
name = "\improper TerraGov beret"
desc = "A plain beret colored in original TerraGov green. It looks like it's missing something."
icon_state = "beret_terragovplain"
- item_state = "beret_terragovplain"
// Inteq
@@ -220,19 +216,16 @@
name = "inteq beret"
desc = "A comfortable looking brown beret with a badge of the golden shield of the IRMG. Denotes the wearer as part of the IRMG."
icon_state = "inteq_beret"
- item_state = "inteq_beret"
/obj/item/clothing/head/beret/sec/hos/inteq
name = "inteq vanguard beret"
desc = "A comfortable looking brown beret with a badge of the golden shield of the IRMG. Denotes the wearer as a vanguard of the IRMG. The padding inside feels thicker."
icon_state = "inteq_beret"
- item_state = "inteq_beret"
/obj/item/clothing/head/beret/sec/hos/inteq/honorable
name = "honorable vanguard beret"
desc = "A snow white beret with an air of distinction around it, emblazoned with the golden shield of the IRMG as the badge."
icon_state = "inteq_honorable_beret"
- item_state = "inteq_honorable_beret"
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
// Frontier
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 7dbe408eb39a..f44e133360e6 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -20,7 +20,7 @@
name = "collectable chef's hat"
desc = "A rare chef's hat meant for hat collectors!"
icon_state = "chef"
- item_state = "chef"
+ item_state = "chefhat"
dog_fashion = /datum/dog_fashion/head/chef
@@ -28,7 +28,6 @@
name = "collectable paper hat"
desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from water, fire, and Curators."
icon_state = "paper"
-
dog_fashion = /datum/dog_fashion/head
/obj/item/clothing/head/collectable/tophat
@@ -41,7 +40,6 @@
name = "collectable captain's hat"
desc = "A collectable hat that'll make you look just like a real comdom!"
icon_state = "captain"
- item_state = "caphat"
dog_fashion = /datum/dog_fashion/head/captain
@@ -49,14 +47,12 @@
name = "collectable police officer's hat"
desc = "A collectable police officer's Hat. This hat emphasizes that you are THE LAW."
icon_state = "policehelm"
-
dog_fashion = /datum/dog_fashion/head/warden
/obj/item/clothing/head/collectable/beret
name = "collectable beret"
desc = "A collectable red beret. It smells faintly of garlic."
icon_state = "beret"
-
dog_fashion = /datum/dog_fashion/head/beret
/obj/item/clothing/head/collectable/welding
@@ -70,28 +66,24 @@
name = "collectable slime hat"
desc = "Just like a real brain slug!"
icon_state = "headslime"
- item_state = "headslime"
clothing_flags = SNUG_FIT
/obj/item/clothing/head/collectable/flatcap
name = "collectable flat cap"
desc = "A collectible laborer's flat cap! Smells like No. 9 coal..."
icon_state = "flat_cap"
- item_state = "detective"
+ item_state = "det_hat"
/obj/item/clothing/head/collectable/pirate
name = "collectable pirate hat"
desc = "You'd make a great Dread Syndie Roberts!"
icon_state = "pirate"
- item_state = "pirate"
-
dog_fashion = /datum/dog_fashion/head/pirate
/obj/item/clothing/head/collectable/kitty
name = "collectable kitty ears"
desc = "The fur feels... a bit too realistic."
icon_state = "kitty"
- item_state = "kitty"
dog_fashion = /datum/dog_fashion/head/kitty
@@ -99,7 +91,6 @@
name = "collectable rabbit ears"
desc = "Not as lucky as the feet!"
icon_state = "bunny"
- item_state = "bunny"
dog_fashion = /datum/dog_fashion/head/rabbit
@@ -107,7 +98,6 @@
name = "collectable wizard's hat"
desc = "NOTE: Any magical powers gained from wearing this hat are purely coincidental."
icon_state = "wizard"
-
dog_fashion = /datum/dog_fashion/head/blue_wizard
/obj/item/clothing/head/collectable/hardhat
@@ -115,8 +105,6 @@
desc = "WARNING! Offers no real protection, but damn, is it fancy!"
clothing_flags = SNUG_FIT
icon_state = "hardhat_standard"
- item_state = "hardhat_standard"
-
dog_fashion = /datum/dog_fashion/head
/obj/item/clothing/head/collectable/HoS
@@ -134,7 +122,6 @@
name = "collectable Thunderdome helmet"
desc = "Go Red! I mean Green! I mean Red! No Green!"
icon_state = "thunderdome"
- item_state = "thunderdome"
clothing_flags = SNUG_FIT
flags_inv = HIDEHAIR
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 0eba8a277915..dba4c2f80406 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -2,7 +2,6 @@
name = "safety helmet"
desc = "A yellow hard hat used in dangerous work settings to protect the head from falling items and errant swinging toolboxes."
icon_state = "hardhat_standard"
- item_state = "hardhat_standard"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
flags_inv = 0
clothing_flags = SNUG_FIT
@@ -12,7 +11,6 @@
name = "hard hat"
desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
icon_state = "hardhat_yellow"
- item_state = "hardhat_yellow"
light_color = "#FFCC66"
light_power = 0.8
armor = list("melee" = 15, "bullet" = 5, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 10, "rad" = 20, "fire" = 100, "acid" = 50) // surprisingly robust against head trauma
@@ -50,10 +48,8 @@
/obj/item/clothing/head/hardhat/update_icon_state()
if(on)
icon_state = "[initial(icon_state)]-on"
- item_state = "[initial(icon_state)]-on"
else
icon_state = "[initial(icon_state)]"
- item_state = "[initial(icon_state)]"
return ..()
/obj/item/clothing/head/hardhat/proc/turn_on(mob/user)
@@ -64,13 +60,11 @@
/obj/item/clothing/head/hardhat/orange
icon_state = "hardhat_orange"
- item_state = "hardhat_orange"
dog_fashion = null
/obj/item/clothing/head/hardhat/red
name = "firefighter helmet"
icon_state = "hardhat_red"
- item_state = "hardhat_red"
clothing_flags = STOPSPRESSUREDAMAGE
heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
@@ -81,14 +75,12 @@
name = "workplace-ready firefighter helmet"
desc = "By applying state of the art lighting technology to a fire helmet, and using photo-chemical hardening methods, this hardhat will protect you from robust workplace hazards."
icon_state = "hardhat_purple"
- item_state = "hardhat_purple"
light_range = 5
resistance_flags = FIRE_PROOF | ACID_PROOF
custom_materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500)
/obj/item/clothing/head/hardhat/white
icon_state = "hardhat_white"
- item_state = "hardhat_white"
clothing_flags = STOPSPRESSUREDAMAGE
heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
@@ -98,7 +90,6 @@
/obj/item/clothing/head/hardhat/green
icon_state = "hardhat_green"
- item_state = "hardhat_green"
clothing_flags = STOPSPRESSUREDAMAGE
heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
@@ -108,17 +99,14 @@
/obj/item/clothing/head/hardhat/dblue
icon_state = "hardhat_dblue"
- item_state = "hardhat_dblue"
dog_fashion = null
/obj/item/clothing/head/hardhat/solgov
icon_state = "hardhat_solgov"
- item_state = "hardhat_solgov"
dog_fashion = null
/obj/item/clothing/head/hardhat/atmos
icon_state = "hardhat_atmos"
- item_state = "hardhat_atmos"
dog_fashion = null
name = "atmospheric technician's firefighting helmet"
desc = "A firefighter's helmet, able to keep the user cool in any situation."
@@ -134,7 +122,6 @@
name = "mining helmet"
desc = "A yellow hard hat used in dangerous mining settings to protect the head from falling rocks and from natives who had advanced in the areas of toolbox swinging technology."
icon_state = "hardhat_mining"
- item_state = "hardhat_mining"
dog_fashion = null
heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
@@ -186,12 +173,10 @@
/obj/item/clothing/head/hardhat/weldhat/orange
icon_state = "hardhat_orange"
- item_state = "hardhat_orange"
/obj/item/clothing/head/hardhat/weldhat/white
desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield!" //This bulb is not smaller
icon_state = "hardhat_white"
- item_state = "hardhat_white"
light_range = 4 //Boss always takes the best stuff
hat_type = "white"
clothing_flags = STOPSPRESSUREDAMAGE
@@ -202,4 +187,3 @@
/obj/item/clothing/head/hardhat/weldhat/dblue
icon_state = "hardhat_dblue"
- item_state = "hardhat_dblue"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index b2ea72519d77..5bc28ff5dc18 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -266,8 +266,6 @@
/obj/item/clothing/head/hunter
name = "bounty hunting hat"
desc = "Ain't nobody gonna cheat the hangman in my town."
- icon_state = "hunter"
- item_state = "hunter"
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -438,13 +436,6 @@
icon_state = "intern_hat"
item_state = "intern_hat"
-/obj/item/clothing/head/coordinator
- name = "coordinator cap"
- desc = "A cap for a party coordinator, stylish!."
- icon_state = "capcap"
- item_state = "that"
- armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-
/obj/item/clothing/head/goatpelt
name = "goat pelt hat"
desc = "Fuzzy and Warm!"
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 4cae19eb5c83..9bccedb4f49b 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -127,7 +127,7 @@
/obj/item/clothing/head/soft/sec/brig_phys
name = "security medic cap"
- icon_state = "secmedsoft"
+ icon_state = "secsoft"
/obj/item/clothing/head/soft/paramedic
name = "paramedic cap"
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index 739e0f832faa..03ca246b60af 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -1,6 +1,8 @@
/obj/item/clothing/mask
name = "mask"
icon = 'icons/obj/clothing/masks.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi'
body_parts_covered = HEAD
slot_flags = ITEM_SLOT_MASK
strip_delay = 40
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 66e329a0e9c6..78bbc032e861 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -33,6 +33,7 @@
desc = "A set of recognizable pre-recorded messages for cyborgs to use when apprehending criminals."
icon = 'icons/obj/device.dmi'
icon_state = "taperecorder_idle"
+ mob_overlay_state = "sechailer"
/obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/adjust))
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index cde7c87b8bbf..8d5251e9e8c8 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -22,7 +22,6 @@
/obj/item/clothing/neck/tie
name = "tie"
desc = "A neosilk clip-on tie. Special material allows it to be reskinned by Alt-clicking it, but only once."
- icon = 'icons/obj/clothing/neck.dmi'
unique_reskin = list("red tie" = "redtie",
"orange tie" = "orangetie",
"green tie" = "greentie",
@@ -312,7 +311,6 @@
/obj/item/clothing/neck/necklace/dope
name = "gold necklace"
desc = "Damn, it feels good to be a gangster."
- icon = 'icons/obj/clothing/neck.dmi'
icon_state = "bling"
cuttable = FALSE
@@ -383,7 +381,6 @@
/obj/item/clothing/neck/beads
name = "plastic bead necklace"
desc = "A cheap, plastic bead necklace. Show team spirit! Collect them! Throw them away! The posibilites are endless!"
- icon = 'icons/obj/clothing/neck.dmi'
icon_state = "beads"
color = "#ffffff"
custom_price = 10
diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
index e2262eb77891..ed32d8b698e7 100644
--- a/code/modules/clothing/outfits/factions/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -19,6 +19,11 @@
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena
+/datum/outfit/job/gezena/assistant/bridge
+ name = "PGF - Bridge Crew"
+ id_assignment = "Bridge Crew"
+ jobtype = /datum/job/head_of_personnel
+
/datum/outfit/job/gezena/engineer
name = "PGF - Navy Engineer"
id_assignment = "Naval Engineer"
@@ -29,6 +34,11 @@
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena/engi
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
/datum/outfit/job/gezena/doctor
name = "PGF - Navy Doctor"
jobtype = /datum/job/doctor
@@ -38,6 +48,12 @@
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena/med
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/med
+ box = /obj/item/storage/box/survival/medical
+
/datum/outfit/job/gezena/security
name = "PGF - Marine"
id_assignment = "Marine"
@@ -48,6 +64,12 @@
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
/datum/outfit/job/gezena/hos
name = "PGF - Marine Sergeant"
id_assignment = "Sergeant"
@@ -55,8 +77,29 @@
job_icon = "headofsecurity"
uniform = /obj/item/clothing/under/gezena/marine
+ head = /obj/item/clothing/head/gezena/marine/lead
shoes = /obj/item/clothing/shoes/combat/gezena
- neck = /obj/item/clothing/neck/cloak/gezena/captain
+ neck = /obj/item/clothing/neck/cloak/gezena/lead
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
+/datum/outfit/job/gezena/hop
+ name = "PGF - Bridge Officer"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "headofpersonnel"
+
+ uniform = /obj/item/clothing/under/gezena
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/command
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
/datum/outfit/job/gezena/captain
name = "PGF - Captain"
@@ -67,6 +110,11 @@
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena/captain
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
//Adminspawn Roles (for events):
/datum/outfit/job/gezena/assistant/geared
@@ -94,6 +142,11 @@
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena/engi
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
/datum/outfit/job/gezena/doctor/geared
name = "PGF - Navy Doctor - Equipped"
jobtype = /datum/job/doctor
@@ -106,6 +159,12 @@
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena/med
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/med
+ box = /obj/item/storage/box/survival/medical
+
/datum/outfit/job/gezena/security/geared
name = "PGF - Marine - Equipped"
jobtype = /datum/job/officer
@@ -120,6 +179,12 @@
neck = /obj/item/clothing/neck/cloak/gezena
r_hand = /obj/item/gun/energy/kalix/pgf/heavy
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
/datum/outfit/job/gezena/hos/geared
name = "PGF - Marine Sergeant - Equipped"
jobtype = /datum/job/hos
@@ -127,13 +192,19 @@
uniform = /obj/item/clothing/under/gezena/marine
suit = /obj/item/clothing/suit/armor/gezena/marine
- head = /obj/item/clothing/head/helmet/gezena
+ head = /obj/item/clothing/head/gezena/marine/lead
belt = /obj/item/storage/belt/military/gezena
gloves = /obj/item/clothing/gloves/gezena/marine
shoes = /obj/item/clothing/shoes/combat/gezena
- neck = /obj/item/clothing/neck/cloak/gezena/captain
+ neck = /obj/item/clothing/neck/cloak/gezena/lead
r_hand = /obj/item/gun/energy/kalix/pgf
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
/datum/outfit/job/gezena/paramedic
name = "PGF - Marine Medic - Equipped"
jobtype = /datum/job/paramedic
@@ -148,6 +219,29 @@
neck = /obj/item/clothing/neck/cloak/gezena/med
r_hand = /obj/item/gun/energy/kalix/pgf
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/para
+ box = /obj/item/storage/box/survival/medical
+
+/datum/outfit/job/gezena/hop/geared
+ name = "PGF - Naval Bridge Officer - Equipped"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "headofpersonnel"
+
+ uniform = /obj/item/clothing/under/gezena
+ suit = /obj/item/clothing/suit/armor/gezena
+ head = /obj/item/clothing/head/gezena
+ gloves = /obj/item/clothing/gloves/gezena
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/command
+ r_hand = /obj/item/gun/energy/kalix/pgf
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
/datum/outfit/job/gezena/captain/geared
name = "PGF - Captain - Equipped"
@@ -160,3 +254,8 @@
gloves = /obj/item/clothing/gloves/gezena/captain
shoes = /obj/item/clothing/shoes/combat/gezena
neck = /obj/item/clothing/neck/cloak/gezena/captain
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
index a3795b7ee057..eeb6a1d8c7f3 100644
--- a/code/modules/clothing/outfits/factions/independent.dm
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -91,6 +91,11 @@
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
+/datum/outfit/job/independent/captain/cheap //for Miskilamo ships
+ name = "Independent - Captain (Low Budget)"
+ gloves = /obj/item/clothing/gloves/color/white //poverty gloves
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+
/datum/outfit/job/independent/captain/western
name = "Independent - Captain (Western)"
head = /obj/item/clothing/head/caphat/cowboy
@@ -253,7 +258,6 @@
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt
shoes = /obj/item/clothing/shoes/jackboots
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
head = /obj/item/clothing/head/cowboy/sec
/datum/outfit/job/independent/security/pirate
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 05db2331fc49..7b2ded27e269 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -1,6 +1,8 @@
/obj/item/clothing/shoes
name = "shoes"
icon = 'icons/obj/clothing/shoes.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/shoes_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/shoes_righthand.dmi'
desc = "Comfortable-looking shoes."
gender = PLURAL //Carn: for grammarically correct text-parsing
var/chained = 0
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index a738bee8f8ed..4c078a7e0ad1 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -1,10 +1,6 @@
/obj/item/clothing/shoes/proc/step_action() //this was made to rewrite clown shoes squeaking
SEND_SIGNAL(src, COMSIG_SHOES_STEP_ACTION)
-/obj/item/clothing/shoes/sneakers/mime
- name = "mime shoes"
- icon_state = "mime"
-
/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses
name = "combat boots"
desc = "High speed, low drag combat boots."
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index aa0367f12ead..e999caf7624b 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -151,8 +151,6 @@ Contains:
/obj/item/clothing/suit/space/pirate
name = "pirate coat"
desc = "Yarr."
- icon_state = "pirate"
- item_state = "pirate"
w_class = WEIGHT_CLASS_NORMAL
flags_inv = 0
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index 358f6a8ba187..0e7edb63f068 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -1,5 +1,7 @@
/obj/item/clothing/suit
icon = 'icons/obj/clothing/suits.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi'
name = "suit"
var/fire_resist = T0C+100
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index 949265f83371..58802e01b8a1 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -31,20 +31,6 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
-/obj/item/clothing/suit/chaplainsuit/studentuni
- name = "student robe"
- desc = "The uniform of a bygone institute of learning."
- icon_state = "studentuni"
- item_state = "studentuni"
- body_parts_covered = ARMS|CHEST
-
-/obj/item/clothing/suit/chaplainsuit/witchhunter
- name = "witchunter garb"
- desc = "This worn outfit saw much use back in the day."
- icon_state = "witchhunter"
- item_state = "witchhunter"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
-
/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit
name = "monk's habit"
desc = "A few steps above rended sackcloth."
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 14f721334462..bce5d5bd2445 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -186,7 +186,8 @@
/obj/item/clothing/head/hooded/cloakhood/goliath/polar
name = "polar cloak"
- icon_state = "polhood"
+ icon_state = "hoodie_gray"
+ mob_overlay_state = "polhood"
desc = "Wear bear on head show little man you big man, kill bear for cloak."
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
cold_protection = HEAD
diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm
index 1feea7adfd0f..b9e7ebb218c0 100644
--- a/code/modules/clothing/suits/hoodies.dm
+++ b/code/modules/clothing/suits/hoodies.dm
@@ -1,7 +1,7 @@
-/obj/item/clothing/suit/hooded/hoodie/
+/obj/item/clothing/suit/hooded/hoodie
name = "hoodie"
desc = "HOW"
- hoodtype = /obj/item/clothing/head/hooded/hood/
+ hoodtype = /obj/item/clothing/head/hooded/hood
body_parts_covered = CHEST|ARMS
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
allowed = list( /obj/item/flashlight,
@@ -15,7 +15,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //it's just a hoodie.
supports_variations = KEPORI_VARIATION
-/obj/item/clothing/head/hooded/hood/
+/obj/item/clothing/head/hooded/hood
name = "hood"
desc = "HOW"
body_parts_covered = HEAD
@@ -85,13 +85,11 @@
/obj/item/clothing/head/hooded/hood/fbp
name = "\improper FBP kepori hood"
desc = "A hood for your FBP hoodie."
- icon_state = "hoodie_fbp"
item_state = "hoodie_fbp"
/obj/item/clothing/suit/hooded/hoodie/rilena
name = "K4L1 hoodie"
desc = "A hoodie themed to look like K4L1 from the popular webseries RILENA. It has a comfy pocket for keeping your hands warm."
- icon_state = "hoodie_rilena"
item_state = "hoodie_rilena"
hoodtype = /obj/item/clothing/head/hooded/hood/rilena
@@ -112,6 +110,5 @@
/obj/item/clothing/head/hooded/hood/rilena
name = "RILENA: LMR K4L1 hood"
desc = "A hood for your RILENA themed hoodie."
- icon_state = "hoodie_rilena"
item_state = "hoodie_rilena"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 0db75bbb1921..43c349d6e095 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -205,24 +205,6 @@
icon_state = "surgical"
allowed = list(/obj/item/scalpel, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor)
-//Robotocist
-
-/obj/item/clothing/suit/hooded/techpriest
- name = "techpriest robes"
- desc = "For those who REALLY love their toasters."
- icon_state = "techpriest"
- item_state = "techpriest"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- hoodtype = /obj/item/clothing/head/hooded/techpriest
-
-/obj/item/clothing/head/hooded/techpriest
- name = "techpriest's hood"
- desc = "A hood for those who REALLY love their toasters."
- icon_state = "techpriesthood"
- item_state = "techpriesthood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS
-
//SolGov suits
/obj/item/clothing/suit/solgov
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 126e34db4f4a..ddd11a4e78e6 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -65,6 +65,7 @@
desc = "Suit for a cyborg costume."
icon_state = "death"
item_state = "death"
+ mob_overlay_state = "cardborg"
flags_1 = CONDUCT_1
fire_resist = T0C+5200
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -658,13 +659,6 @@
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK
-/obj/item/clothing/suit/coordinator
- name = "coordinator jacket"
- desc = "A jacket for a party ooordinator, stylish!."
- icon_state = "capformal"
- item_state = "capspacesuit"
- armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-
/obj/item/clothing/suit/hawaiian
name = "hawaiian overshirt"
desc = "A cool shirt for chilling on the beach."
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 356bef71acac..7a8e21ae2bea 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -2,6 +2,8 @@
name = "under"
icon = 'icons/obj/clothing/under/default.dmi'
mob_overlay_icon = 'icons/mob/clothing/under/default.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi'
body_parts_covered = CHEST|GROIN|LEGS|ARMS
permeability_coefficient = 0.9
slot_flags = ITEM_SLOT_ICLOTHING
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 2f0660bffebf..ed1d12be3fcb 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -475,16 +475,12 @@
/obj/item/clothing/accessory/holster/nukie
name = "operative holster"
desc = "A deep shoulder holster capable of holding almost any form of ballistic weaponry."
- icon_state = "syndicate_holster"
- item_state = "syndicate_holster"
w_class = WEIGHT_CLASS_BULKY
pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/nukie
/obj/item/clothing/accessory/holster/chameleon
name = "syndicate holster"
desc = "A two pouched hip holster that uses chameleon technology to disguise itself and any guns in it."
- icon_state = "syndicate_holster"
- item_state = "syndicate_holster"
var/datum/action/item_action/chameleon/change/chameleon_action
pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/chameleon
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 1a2cfdd33fd7..bbd0d962601f 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -11,6 +11,7 @@
/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
+ mob_overlay_state = "rainbow" // if you somehow equip it like that
/obj/item/clothing/under/color/random/Initialize()
..()
@@ -24,6 +25,7 @@
/obj/item/clothing/under/color/jumpskirt/random
icon_state = "random_jumpsuit" //Skirt variant needed
+ mob_overlay_state = "rainbow"
/obj/item/clothing/under/color/jumpskirt/random/Initialize()
..()
diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
index 59b83eb7e3e5..0f58017a2e73 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
@@ -151,4 +151,3 @@
desc = "It's very colourful on the inside."
icon_state = "mime_enviroskirt"
item_state = "mime_enviroskirt"
-
diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm
index 965ec45c3d18..8a95cee6c3ed 100644
--- a/code/modules/clothing/under/jobs/civilian/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian/civilian.dm
@@ -222,11 +222,6 @@
icon_state = "lawyer_galaxy_red"
item_state = "r_suit"
-/obj/item/clothing/under/rank/civilian/cookjorts
- name = "grilling shorts"
- desc = "For when all you want in life is to grill for god's sake!"
- icon_state = "cookjorts"
-
/obj/item/clothing/under/rank/civilian/janitor
name = "janitor's jumpsuit"
desc = "It's the official uniform of a Nanotrasen janitor. It has minor protection from biohazards."
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index cf08ad4ed4c6..29ee1c732399 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -99,16 +99,19 @@
/obj/item/clothing/under/rank/security/brig_phys/nt
name = "security medic's uniform"
desc = "A lightly armored uniform worn by members of Nanotrasen's Asset Protection Medical Corps."
- icon_state = "rbrig_phys"
+ icon_state = "security_medic"
item_state = "r_suit"
+ mob_overlay_state = "rbrig_phys"
/obj/item/clothing/under/rank/security/brig_phys/nt/skirt
name = "security medic's uniform"
desc = "A lightly armored uniform, with a skirt, worn by members of Nanotrasen's Asset Protection Medical Corps."
- icon_state = "rbrig_phys_skirt"
+ icon_state = "security_medic_skirt"
+ mob_overlay_state = "rbrig_phys_skirt"
body_parts_covered = CHEST|GROIN|ARMS
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
// Warden //
/obj/item/clothing/under/rank/security/warden
name = "warden's security suit"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 5e3d288adca5..019d731a2708 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -113,15 +113,6 @@
armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
cuttable = FALSE
-/obj/item/clothing/under/misc/coordinator
- name = "coordinator jumpsuit"
- desc = "A jumpsuit made by party people, from party people, for party people."
- icon = 'icons/obj/clothing/under/command.dmi'
- mob_overlay_icon = 'icons/mob/clothing/under/command.dmi'
- icon_state = "captain_parade"
- item_state = "by_suit"
- can_adjust = FALSE
-
/obj/item/clothing/under/utility
icon = 'icons/obj/clothing/under/misc.dmi'
mob_overlay_icon = 'icons/mob/clothing/under/misc.dmi'
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 8f30c0cab2ce..58e83cf71284 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -33,3 +33,8 @@
/obj/item/clothing/under/shorts/purple
name = "purple athletic shorts"
icon_state = "purpleshorts"
+
+/obj/item/clothing/under/shorts/cookjorts
+ name = "grilling shorts"
+ desc = "For when all you want in life is to grill for god's sake!"
+ icon_state = "greyshorts"
diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index f580aca9c0c9..64280475664a 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -1,55 +1,46 @@
-#define DUMPTIME 3000
-
/datum/bank_account
var/account_holder = "Rusty Venture"
var/account_balance = 0
- var/datum/job/account_job
var/list/bank_cards = list()
- ///If the account has been frozen by someone at an account management terminal.
- var/frozen = FALSE
var/add_to_accounts = TRUE
var/account_id
- var/being_dumped = FALSE //pink levels are rising
- var/withdrawDelay = 0
/datum/bank_account/New(newname, job)
if(add_to_accounts)
SSeconomy.bank_accounts += src
account_holder = newname
- account_job = job
account_id = rand(111111,999999)
/datum/bank_account/Destroy()
if(add_to_accounts)
SSeconomy.bank_accounts -= src
- for(var/obj/item/card/id/id_card in bank_cards)
+ for(var/obj/item/card/id/id_card as anything in bank_cards)
id_card.registered_account = null
+ SSeconomy.bank_money -= account_balance
return ..()
-/datum/bank_account/proc/dumpeet()
- being_dumped = TRUE
- withdrawDelay = world.time + DUMPTIME
-
/datum/bank_account/proc/_adjust_money(amt)
account_balance += amt
if(account_balance < 0)
account_balance = 0
/datum/bank_account/proc/has_money(amt)
- return account_balance >= amt && !frozen
+ return account_balance >= amt
-/datum/bank_account/proc/adjust_money(amt)
- if((amt < 0 && has_money(-amt)) || amt > 0 && !frozen)
+/datum/bank_account/proc/adjust_money(amt, reason = "cash")
+ if((amt < 0 && has_money(-amt)) || amt > 0)
+ SSblackbox.record_feedback("tally", "credits", amt, reason)
+ SSeconomy.bank_money += amt
_adjust_money(amt)
return TRUE
return FALSE
/datum/bank_account/proc/transfer_money(datum/bank_account/from, amount)
if(from.has_money(amount))
- adjust_money(amount)
+ adjust_money(amount, "transfer")
SSblackbox.record_feedback("amount", "credits_transferred", amount)
log_econ("[amount] credits were transferred from [from.account_holder]'s account to [src.account_holder]")
- from.adjust_money(-amount)
+ from.adjust_money(-amount, "transfer_out")
return TRUE
return FALSE
@@ -94,20 +85,4 @@
/datum/bank_account/ship/New(newname, budget)
account_holder = newname
- account_balance = budget
-
-/datum/bank_account/department
- account_holder = "Guild Credit Agency"
- var/department_id = "REPLACE_ME"
- add_to_accounts = FALSE
-
-/datum/bank_account/department/New(dep_id, budget)
- department_id = dep_id
- account_balance = budget
- account_holder = SSeconomy.department_accounts[dep_id]
- SSeconomy.generated_accounts += src
-
-/datum/bank_account/remote // Bank account not belonging to the local station
- add_to_accounts = FALSE
-
-#undef DUMPTIME
+ adjust_money(budget, "starting_money")
diff --git a/code/modules/economy/pay_stand.dm b/code/modules/economy/pay_stand.dm
index 071971c2a894..af7d9be4b947 100644
--- a/code/modules/economy/pay_stand.dm
+++ b/code/modules/economy/pay_stand.dm
@@ -54,7 +54,7 @@
if(momsdebitcard < 1)
to_chat(user, "ERROR: Invalid amount designated. ")
return
- if(vbucks.registered_account.adjust_money(-momsdebitcard))
+ if(vbucks.registered_account.adjust_money(-momsdebitcard, "transfer"))
purchase(vbucks.registered_account.account_holder, momsdebitcard)
to_chat(user, "Thanks for purchasing! The vendor has been informed.")
return
@@ -117,7 +117,7 @@
return ..()
/obj/machinery/paystand/proc/purchase(buyer, price)
- my_card.registered_account.adjust_money(price)
+ my_card.registered_account.adjust_money(price, "transfer")
my_card.registered_account.bank_card_talk("Purchase made at your vendor by [buyer] for [price] credits.")
amount_deposited = amount_deposited + price
if(signaler && amount_deposited >= signaler_threshold)
diff --git a/code/modules/economy/selling_pad.dm b/code/modules/economy/selling_pad.dm
index 46d660c5cec3..cf155ad251bd 100644
--- a/code/modules/economy/selling_pad.dm
+++ b/code/modules/economy/selling_pad.dm
@@ -34,15 +34,9 @@
sell_account = port.current_ship?.ship_account
/obj/machinery/computer/selling_pad_control/attackby(obj/item/I, mob/user)
- var/value = 0
- if(istype(I, /obj/item/spacecash/bundle))
- var/obj/item/spacecash/bundle/C = I
- value = C.value
- else if(istype(I, /obj/item/holochip))
- var/obj/item/holochip/H = I
- value = H.credits
+ var/value = I.get_item_credit_value()
if(value)
- sell_account.adjust_money(value)
+ sell_account.adjust_money(value, "selling_pad")
to_chat(user, "You deposit [I]. The Vessel Budget is now [sell_account.account_balance] cr. ")
qdel(I)
return TRUE
@@ -156,7 +150,7 @@
total_report.total_amount[E] += ex.total_amount[E]
total_report.total_value[E] += ex.total_value[E]
- sell_account.adjust_money(value)
+ sell_account.adjust_money(value, "selling_pad")
if(!value)
status_report += "Nothing"
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index 82edb0698208..f474018739d0 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -3,7 +3,7 @@
name = "generic looking aquarium fish"
desc = "very bland"
icon = 'icons/obj/aquarium.dmi'
- icon_state = "bugfish"
+ icon_state = "trout" //Replace this with "bugfish" from tg please
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 64bb4fdae667..8f88924930f4 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -4,7 +4,7 @@
/obj/item/reagent_containers/food/drinks
name = "drink"
desc = "yummy"
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = null
lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
@@ -287,7 +287,7 @@
/obj/item/reagent_containers/food/drinks/waterbottle
name = "bottle of water"
desc = "A bottle of water filled at an old Earth bottling facility."
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "smallbottle"
item_state = "bottle"
list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
@@ -407,7 +407,7 @@
return
var/obj/item/broken_bottle/B = new (loc)
B.icon_state = icon_state
- var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
+ var/icon/I = new('icons/obj/drinks/drinks.dmi', src.icon_state)
I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
B.icon = I
@@ -466,7 +466,7 @@
/obj/item/reagent_containers/food/drinks/colocup
name = "colo cup"
desc = "A cheap, mass produced style of cup, typically used at parties. They never seem to come out red, for some reason..."
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "colocup"
lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index b4d8cf8090c9..4da78a5989a1 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -45,7 +45,7 @@
thrower.put_in_hands(B)
B.icon_state = icon_state
- var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
+ var/icon/I = new('icons/obj/drinks/drinks.dmi', src.icon_state)
I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
B.icon = I
@@ -138,7 +138,7 @@
/obj/item/broken_bottle
name = "broken bottle"
desc = "A bottle with a sharp broken bottom."
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "broken_bottle"
force = 9
throwforce = 5
@@ -149,7 +149,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("stabbed", "slashed", "attacked")
sharpness = IS_SHARP
- var/static/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
+ var/static/icon/broken_outline = icon('icons/obj/drinks/drinks.dmi', "broken")
/obj/item/broken_bottle/Initialize()
. = ..()
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index 9e89336ae08e..f1a5862649a4 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -14,7 +14,7 @@
name = "holographic energy sword"
desc = "May the force be with you. Sorta."
icon = 'icons/obj/transforming_energy.dmi'
- icon_state = "sword0"
+ icon_state = "sword"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 3.0
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index 149f78437fa4..022b3278e92b 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -75,7 +75,7 @@
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
icon_state = "headphones"
- item_state = "headphones"
+ item_state = "earmuffs"
slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD
force = 0
w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 67d45dd8d058..ee0d7789355e 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -124,7 +124,7 @@
return FALSE
if(!visualsOnly)
var/datum/bank_account/bank_account = new(H.real_name, src)
- bank_account.adjust_money(officer ? 250 : 100) //just a little bit of money for you
+ bank_account.adjust_money(officer ? 250 : 100, "starting_money") //just a little bit of money for you
H.account_id = bank_account.account_id
//Equip the rest of the gear
diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm
index 1c3d318eeffb..d67dbb12f572 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -18,7 +18,7 @@
belt = /obj/item/pda/cook
ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/civilian/chef
- alt_uniform = /obj/item/clothing/under/rank/civilian/cookjorts //WS Edit - Alt Uniforms
+ alt_uniform = /obj/item/clothing/under/shorts/cookjorts //WS Edit - Alt Uniforms
suit = /obj/item/clothing/suit/toggle/chef
alt_suit = /obj/item/clothing/suit/apron/chef
head = /obj/item/clothing/head/chefhat
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 8bac57a8b764..41fce675bf70 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -174,7 +174,7 @@
/obj/item/clothing/head/hooded/survivor_hood
name = "survivor hood"
desc = "A loose-fitting hood, patched up with sealant and adhesive. Somewhat protects the head from the environment, but gets the job done."
- icon_state = "survivor_hood"
+ icon_state = "explorerold"
suit = /obj/item/clothing/suit/hooded/survivor
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index c4b75883eb67..5e012735b706 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -283,14 +283,12 @@
/obj/structure/sign/mining
name = "\improper Nanotrasen mining corps sign"
desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims."
- icon = 'icons/turf/walls/survival_pod_walls.dmi'
- icon_state = "ntpod"
+ icon_state = "nanotrasen"
/obj/structure/sign/mining/survival
name = "shelter sign"
desc = "A high visibility sign designating a safe shelter."
- icon = 'icons/turf/walls/survival_pod_walls.dmi'
- icon_state = "survival"
+ icon_state = "secureareaold"
//Fluff
/obj/structure/tubes
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 5428fd52bb88..42cc2a74d6a4 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -281,30 +281,31 @@
activated = TRUE
//Memento Mori
-/obj/item/clothing/neck/necklace/memento_mori
+/obj/item/clothing/neck/memento_mori
name = "Memento Mori"
desc = "A mysterious pendant. An inscription on it says: \"Certain death tomorrow means certain life today.\""
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "memento_mori"
+ mob_overlay_state = "crystal_talisman"
actions_types = list(/datum/action/item_action/hands_free/memento_mori)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/mob/living/carbon/human/active_owner
-/obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot)
+/obj/item/clothing/neck/memento_mori/item_action_slot_check(slot)
return slot == ITEM_SLOT_NECK
-/obj/item/clothing/neck/necklace/memento_mori/dropped(mob/user)
+/obj/item/clothing/neck/memento_mori/dropped(mob/user)
..()
if(active_owner)
mori()
//Just in case
-/obj/item/clothing/neck/necklace/memento_mori/Destroy()
+/obj/item/clothing/neck/memento_mori/Destroy()
if(active_owner)
mori()
return ..()
-/obj/item/clothing/neck/necklace/memento_mori/proc/memento(mob/living/carbon/human/user)
+/obj/item/clothing/neck/memento_mori/proc/memento(mob/living/carbon/human/user)
to_chat(user, "You feel your life being drained by the pendant... ")
if(do_after(user, 40, target = user))
to_chat(user, "Your lifeforce is now linked to the pendant! You feel like removing it would kill you, and yet you instinctively know that until then, you won't die. ")
@@ -314,7 +315,7 @@
icon_state = "memento_mori_active"
active_owner = user
-/obj/item/clothing/neck/necklace/memento_mori/proc/mori()
+/obj/item/clothing/neck/memento_mori/proc/mori()
icon_state = "memento_mori"
if(!active_owner)
return
@@ -329,7 +330,7 @@
desc = "Bind your life to the pendant."
/datum/action/item_action/hands_free/memento_mori/Trigger()
- var/obj/item/clothing/neck/necklace/memento_mori/MM = target
+ var/obj/item/clothing/neck/memento_mori/MM = target
if(!MM.active_owner)
if(ishuman(owner))
MM.memento(owner)
@@ -510,7 +511,7 @@
desc = "A hook."
projectile_type = /obj/projectile/hook
caliber = "hook"
- icon_state = "hook"
+ icon_state = "arrow"
/obj/projectile/hook
name = "hook"
@@ -667,7 +668,6 @@
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "paradox_bag"
mob_overlay_icon = 'icons/mob/clothing/belt.dmi'
- mob_overlay_state = "paradoxbag"
slot_flags = ITEM_SLOT_BELT
resistance_flags = INDESTRUCTIBLE
@@ -888,8 +888,6 @@
desc = "Buried deep beneath the earth, these ancient gauntlets absorbed the tectonic power of earthquakes. "
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "concussive_gauntlets"
- mob_overlay_icon = 'icons/mob/clothing/hands.dmi'
- mob_overlay_state = "concussive_gauntlets"
toolspeed = 0.1
strip_delay = 40
equip_delay_other = 20
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 2af7db0f4b6c..c84d61ab7cf2 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -11,7 +11,6 @@
shoot_inventory_chance = 0
circuit = /obj/item/circuitboard/machine/vending/mining_equipment
refill_canister = /obj/item/vending_refill/mining_equipment
- payment_department = ACCOUNT_CAR
vend_ready = "Good luck, you're going to need it."
mining_point_vendor = TRUE
default_price = 100
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index cb7c7adafc4b..bfa71f3b335e 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -1,5 +1,5 @@
/obj/item/organ/alien
- icon_state = "xgibmid2"
+ icon_state = "liver-x"
food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10)
var/list/alien_powers = list()
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index 7afe5068e276..931c62d37920 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -6,7 +6,7 @@
var/t_has = p_have()
var/t_is = p_are()
- . = list("This is [icon2html(src, user)] \a [src] !>")
+ . = list("This is [icon2html(src, user)] \a [src] !")
var/list/obscured = check_obscured_slots()
if (handcuffed)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index ceda44284f46..b024be2f96f7 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -367,7 +367,6 @@
. += "Criminal status: \[[criminal]\] "
. += jointext(list("Security record: \[View\] ",
- "\[Add citation\] ",
"\[Add crime\] ",
"\[View comment log\] ",
"\[Add comment\] "), "")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 93276a6710a6..f3802e381c55 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -432,38 +432,6 @@
to_chat(usr, "Notes: [R.fields["notes"]]")
return
- if(href_list["add_citation"])
- var/maxFine = CONFIG_GET(number/maxfine)
- var/t1 = stripped_input("Please input citation crime:", "Security HUD", "", null)
- var/fine = FLOOR(input("Please input citation fine, up to [maxFine]:", "Security HUD", 50) as num|null, 1)
- if(!R || !t1 || !fine || !allowed_access)
- return
- if(!H.canUseHUD())
- return
- if(!HAS_TRAIT(H, TRAIT_SECURITY_HUD))
- return
- if(fine < 0)
- to_chat(usr, "You're pretty sure that's not how money works. ")
- return
- fine = min(fine, maxFine)
-
- var/crime = GLOB.data_core.createCrimeEntry(t1, "", allowed_access, station_time_timestamp(), fine)
- for (var/obj/item/pda/P in GLOB.PDAs)
- if(P.owner == R.fields["name"])
- var/message = "You have been fined [fine] credits for '[t1]'. Fines may be paid at security."
- var/datum/signal/subspace/messaging/pda/signal = new(src, list(
- "name" = "Security Citation",
- "job" = "Citation Server",
- "message" = message,
- "targets" = list("[P.owner] ([P.ownjob])"),
- "automated" = 1
- ))
- signal.send_to_receivers()
- usr.log_message("(PDA: Citation Server) sent \"[message]\" to [signal.format_target()]", LOG_PDA)
- GLOB.data_core.addCitation(R.fields["id"], crime)
- investigate_log("New Citation: [t1] Fine: [fine] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS)
- return
-
if(href_list["add_crime"])
var/t1 = stripped_input("Please input crime name:", "Security HUD", "", null)
if(!R || !t1 || !allowed_access)
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index eeb3948e627c..1e40ddf76704 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -16,6 +16,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
RADIO_KEY_SOLGOV = RADIO_CHANNEL_SOLGOV, //WS Edit - SolGov Rep
RADIO_KEY_NANOTRASEN = RADIO_CHANNEL_NANOTRASEN,
RADIO_KEY_MINUTEMEN = RADIO_CHANNEL_MINUTEMEN,
+ RADIO_KEY_PGF = RADIO_CHANNEL_PGF,
RADIO_KEY_INTEQ = RADIO_CHANNEL_INTEQ,
RADIO_KEY_PIRATE = RADIO_CHANNEL_PIRATE,
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index af33ef493167..df2508c5f4a0 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -40,7 +40,6 @@
var/fair_market_price_arrest = 25 // On arrest, charges the violator this much. If they don't have that much in their account, the securitron will beat them instead
var/fair_market_price_detain = 5 // Charged each time the violator is stunned on detain
var/weapon_force = 20 // Only used for NAP violation beatdowns on non-grievous securitrons
- var/market_verb = "Suspect"
var/payment_department = ACCOUNT_SEC
/mob/living/simple_animal/bot/secbot/beepsky
@@ -237,10 +236,7 @@ Auto Patrol: []"},
if(iscarbon(A))
var/mob/living/carbon/C = A
if(!C.IsParalyzed() || arrest_type)
- if(!check_nap_violations())
- stun_attack(A, TRUE)
- else
- stun_attack(A)
+ stun_attack(A)
else if(C.canBeHandcuffed() && !C.handcuffed)
cuff(A)
else
@@ -320,10 +316,7 @@ Auto Patrol: []"},
if(target) // make sure target exists
if(Adjacent(target) && isturf(target.loc)) // if right next to perp
- if(!check_nap_violations())
- stun_attack(target, TRUE)
- else
- stun_attack(target)
+ stun_attack(target)
mode = BOT_PREP_ARREST
set_anchored(TRUE)
@@ -367,9 +360,6 @@ Auto Patrol: []"},
return
if(target.handcuffed) //no target or target cuffed? back to idle.
- if(!check_nap_violations())
- stun_attack(target, TRUE)
- return
back_to_idle()
return
@@ -497,38 +487,3 @@ Auto Patrol: []"},
/obj/machinery/bot_core/secbot
req_access = list(ACCESS_SECURITY)
-
-/// Returns false if the current target is unable to pay the fair_market_price for being arrested/detained
-/mob/living/simple_animal/bot/secbot/proc/check_nap_violations()
- if(!SSeconomy.full_ancap)
- return TRUE
-
- if(target)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- var/obj/item/card/id/I = H.get_idcard(TRUE)
- if(I)
- var/datum/bank_account/insurance = I.registered_account
- if(!insurance)
- say("[market_verb] NAP Violation: No bank account found.")
- nap_violation(target)
- return FALSE
- else
- var/fair_market_price = (arrest_type ? fair_market_price_detain : fair_market_price_arrest)
- if(!insurance.adjust_money(-fair_market_price))
- say("[market_verb] NAP Violation: Unable to pay.")
- nap_violation(target)
- return FALSE
- var/datum/bank_account/D = SSeconomy.get_dep_account(payment_department)
- say("Thank you for your compliance. Your account been charged [fair_market_price] credits.")
- if(D)
- D.adjust_money(fair_market_price)
- else
- say("[market_verb] NAP Violation: No ID card found.")
- nap_violation(target)
- return FALSE
- return TRUE
-
-/// Does nothing
-/mob/living/simple_animal/bot/secbot/proc/nap_violation(mob/violator)
- return
diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm
index 00344f48da59..1e02c89c81f7 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/support.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm
@@ -93,7 +93,7 @@
name = "bluespace receiving pad"
icon = 'icons/turf/floors.dmi'
desc = "A receiving zone for bluespace teleportations."
- icon_state = "light_on-w"
+ icon_state = "light_on_flicker-1"
light_range = MINIMUM_USEFUL_LIGHT_RANGE
density = FALSE
anchored = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 14849bb58014..550c78532cd6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -326,7 +326,7 @@ Difficulty: Extremely Hard
/obj/item/crusher_trophy/ice_block_talisman
name = "ice block talisman"
desc = "A glowing trinket that a demonic miner had on him, it seems he couldn't utilize it for whatever reason."
- icon_state = "ice_trap_talisman"
+ icon_state = "freeze_cube"
denied_type = /obj/item/crusher_trophy/ice_block_talisman
/obj/item/crusher_trophy/ice_block_talisman/effect_desc()
diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
index f6d5aa779ad4..55d873cf036a 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -175,7 +175,6 @@
max_integrity = 50
spawn_time = 600 //1 minute
max_mobs = 15
- icon = 'icons/mob/nest.dmi'
spawn_text = "crawls through"
mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody)
faction = list("nether")
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index f78c7e36ac6d..9697cce45df3 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -5,7 +5,7 @@
name = "modular microcomputer"
desc = "A small portable microcomputer."
icon = 'icons/obj/machines/computer.dmi'
- icon_state = "laptop-open"
+ icon_state = "laptop"
light_on = FALSE
integrity_failure = 0.5
max_integrity = 100
diff --git a/code/modules/modular_computers/file_system/programs/arcade.dm b/code/modules/modular_computers/file_system/programs/arcade.dm
index c220881365ec..6e6d235c1b7b 100644
--- a/code/modules/modular_computers/file_system/programs/arcade.dm
+++ b/code/modules/modular_computers/file_system/programs/arcade.dm
@@ -28,7 +28,7 @@
usr?.mind?.adjust_experience(/datum/skill/gaming, 1)
if(boss_hp <= 0)
heads_up = "You have crushed [boss_name]! Rejoice!"
- playsound(computer.loc, 'sound/arcade/win.ogg', 50)
+ playsound(computer.loc, 'sound/arcade/win.ogg', 25)
game_active = FALSE
program_icon_state = "arcade_off"
if(istype(computer))
@@ -38,7 +38,7 @@
sleep(10)
else if(player_hp <= 0 || player_mp <= 0)
heads_up = "You have been defeated... how will the station survive?"
- playsound(computer.loc, 'sound/arcade/lose.ogg', 50)
+ playsound(computer.loc, 'sound/arcade/lose.ogg', 25)
game_active = FALSE
program_icon_state = "arcade_off"
if(istype(computer))
@@ -58,17 +58,17 @@
return
if (boss_mp <= 5)
heads_up = "[boss_mpamt] magic power has been stolen from you!"
- playsound(computer.loc, 'sound/arcade/steal.ogg', 50, TRUE)
+ playsound(computer.loc, 'sound/arcade/steal.ogg', 25, TRUE)
player_mp -= boss_mpamt
boss_mp += boss_mpamt
else if(boss_mp > 5 && boss_hp <12)
heads_up = "[boss_name] heals for [bossheal] health!"
- playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE)
+ playsound(computer.loc, 'sound/arcade/heal.ogg', 25, TRUE)
boss_hp += bossheal
boss_mp -= boss_mpamt
else
heads_up = "[boss_name] attacks you for [boss_attackamt] damage!"
- playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE)
+ playsound(computer.loc, 'sound/arcade/hit.ogg', 25, TRUE)
player_hp -= boss_attackamt
pause_state = FALSE
@@ -109,7 +109,7 @@
attackamt = rand(2,6) + rand(0, gamerSkill)
pause_state = TRUE
heads_up = "You attack for [attackamt] damage."
- playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE)
+ playsound(computer.loc, 'sound/arcade/hit.ogg', 25, TRUE)
boss_hp -= attackamt
sleep(10)
game_check()
@@ -126,7 +126,7 @@
healcost = rand(1, maxPointCost)
pause_state = TRUE
heads_up = "You heal for [healamt] damage."
- playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE)
+ playsound(computer.loc, 'sound/arcade/heal.ogg', 25, TRUE)
player_hp += healamt
player_mp -= healcost
sleep(10)
@@ -139,7 +139,7 @@
rechargeamt = rand(4,7) + rand(0, gamerSkill)
pause_state = TRUE
heads_up = "You regain [rechargeamt] magic power."
- playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE)
+ playsound(computer.loc, 'sound/arcade/mana.ogg', 25, TRUE)
player_mp += rechargeamt
sleep(10)
game_check()
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index 7d518c0b2f6d..eb363de15792 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -254,7 +254,7 @@
var/obj/item/card/id/ID = I
var/datum/bank_account/account = ID.registered_account
var/target_credits = total_price - credits
- if(!account.adjust_money(-target_credits))
+ if(!account.adjust_money(-target_credits, "laptop_vendor"))
say("Insufficient credits on card to purchase!")
return
credits += target_credits
diff --git a/code/modules/overmap/missions.dm b/code/modules/overmap/missions.dm
index 41ac27dce3a1..0bc2c2f34722 100644
--- a/code/modules/overmap/missions.dm
+++ b/code/modules/overmap/missions.dm
@@ -63,7 +63,7 @@
return ..()
/datum/mission/proc/turn_in()
- servant.ship_account.adjust_money(value)
+ servant.ship_account.adjust_money(value, "mission")
qdel(src)
/datum/mission/proc/give_up()
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index 9c9024126b0a..8174a3e365f4 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -420,7 +420,7 @@
/obj/item/key/ship
name = "ship key"
desc = "A key for locking and unlocking the helm of a ship, comes with a ball chain so it can be worn around the neck. Comes with a cute little shuttle-shaped keychain."
- icon_state = "keyship"
+ icon_state = "shipkey"
var/datum/overmap/ship/controlled/master_ship
var/static/list/key_colors = list(
"blue" = "#4646fc",
diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm
index 20ff55f0d789..51efaba06046 100644
--- a/code/modules/paperwork/paper_cutter.dm
+++ b/code/modules/paperwork/paper_cutter.dm
@@ -101,7 +101,7 @@
/obj/item/paper/paperslip/corporate //More fancy and sturdy paper slip which is a "plastic card", used for things like spare ID safe code
name = "corporate plastic card"
desc = "A plastic card for confidental corporate matters. Can be written on with pen somehow."
- icon_state = "corppaperslip"
+ icon_state = "paperbiscuit"
grind_results = list(/datum/reagent/plastic_polymers = 1.5) //It's a plastic card after all
max_integrity = 130 //Slightly more sturdy because of being made out of a plastic
drop_sound = 'sound/items/handling/disk_drop.ogg'
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 2578fc97961c..3bfc292108b5 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -127,7 +127,7 @@
/obj/item/stamp/clip
name = "CLIP Minutemen rubber stamp"
- icon_state = "stamp-clip"
+ icon_state = "stamp-cmm"
dye_color = DYE_FO
/obj/item/stamp/gold
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index 5a9d9192dbbf..87096bad7e56 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -40,7 +40,7 @@
default_unfasten_wrench(user, I)
return TRUE
-/obj/machinery/plumbing/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
+/obj/machinery/plumbing/plunger_act(obj/item/plunger/P, mob/living/user)
to_chat(user, "You start furiously plunging [name]. ")
if(do_after(user, 30, target = src))
to_chat(user, "You finish plunging the [name]. ")
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 2d801de426af..8850c4e68981 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -70,9 +70,7 @@
loaded_tank.air_contents.adjust_moles(GAS_O2, -gasdrained)
loaded_tank.air_contents.adjust_moles(GAS_CO2, gasdrained*2)
var/bitcoins_mined = RAD_COLLECTOR_OUTPUT
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_ENG)
- if(D)
- D.adjust_money(bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE)
+ new /obj/item/spacecash(get_dumping_location(), bitcoins_mined * RAD_COLLECTOR_MINING_CONVERSION_RATE)
stored_research += bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE*PRIVATE_TECHWEB_GAIN
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE*PUBLIC_TECHWEB_GAIN)
stored_energy-=bitcoins_mined
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 421550cd52df..afd68d5ab7b2 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -23,7 +23,7 @@
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator."
icon = 'icons/obj/machines/particle_accelerator.dmi'
- icon_state = "none"
+ icon_state = "emitter_center"
anchored = FALSE
density = TRUE
max_integrity = 500
diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
index fc7cca55e655..15617eca5260 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
@@ -2,7 +2,7 @@
name = "EM Containment Grid"
desc = "This launches the Alpha particles, might not want to stand near this end."
icon = 'icons/obj/machines/particle_accelerator.dmi'
- icon_state = "none"
+ icon_state = "emitter_center"
var/fire_delay = 50
var/last_shot = 0
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 82372d221baf..ccbb774f0224 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -96,9 +96,7 @@
var/power_produced = powernet ? power / power_loss : power
add_avail(power_produced*input_power_multiplier)
flick("coilhit", src)
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_ENG)
- if(D)
- D.adjust_money(min(power_produced, 1))
+ new /obj/item/spacecash(get_dumping_location(), power_produced)
if(istype(linked_techweb) && (zap_flags & ZAP_GIVES_RESEARCH) && can_generate_research)
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 3)) // x4 coils = 12 points a shock for RND, if they even bothered to link the server.
addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
@@ -135,9 +133,7 @@
var/power_produced = powernet ? power / power_loss : power
add_avail(power_produced*input_power_multiplier)
flick("rpcoilhit", src)
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_ENG)
- if(D)
- D.adjust_money(min(power_produced, 12))
+ new /obj/item/spacecash(get_dumping_location(), min(power_produced, 12))
if(istype(linked_techweb) && (zap_flags & ZAP_GIVES_RESEARCH))
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 25)) // x4 coils = 100 points per shock, which is a good reward for building a research tesla or electrical storm harvest ship
addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index e5df30533e35..87f47b99d36d 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -38,6 +38,8 @@
/obj/item/ammo_box/Initialize()
. = ..()
+ if(!base_icon_state)
+ base_icon_state = icon_state
if (!bullet_cost)
for (var/material in custom_materials)
var/material_amount = custom_materials[material]
@@ -150,9 +152,9 @@
var/shells_left = LAZYLEN(stored_ammo)
switch(multiple_sprites)
if(AMMO_BOX_PER_BULLET)
- icon_state = "[initial(icon_state)]-[shells_left]"
+ icon_state = "[base_icon_state]-[shells_left]"
if(AMMO_BOX_FULL_EMPTY)
- icon_state = "[initial(icon_state)]-[shells_left ? "[max_ammo]" : "0"]"
+ icon_state = "[base_icon_state]-[shells_left ? "1" : "0"]"
return ..()
/// Updates the amount of material in this ammo box according to how many bullets are left in it.
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index fbd5ddd214dc..fa7b0a133bae 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -3,8 +3,10 @@
/obj/item/ammo_box/a357
name = "speed loader (.357)"
desc = "A 7-round speed loader for quickly reloading .357 revolvers. These rounds do good damage with average performance against armor."
- icon_state = "357"
+ icon_state = "speedloader_357-7"
+ base_icon_state = "speedloader_357"
ammo_type = /obj/item/ammo_casing/a357
+ caliber = ".357"
max_ammo = 7
multiple_sprites = AMMO_BOX_PER_BULLET
item_flags = NO_MAT_REDEMPTION
@@ -31,30 +33,34 @@
max_ammo = 12
/obj/item/ammo_box/a4570/match
- name = "ammo holder (.45-70 match)"
- desc = "A 6-round ammo holder for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
+ name = "ammo box (.45-70 match)"
+ desc = "A 12-round ammo box for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
icon_state = "4570-match"
ammo_type = /obj/item/ammo_casing/a4570/match
+
/obj/item/ammo_box/a4570/hp
- name = "ammo holder (.45-70 hollow point)"
- desc = "A 6-round ammo holder for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
+ name = "ammo box (.45-70 hollow point)"
+ desc = "A 12-round ammo box for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
icon_state = "4570-hp"
ammo_type = /obj/item/ammo_casing/a4570/hp
/obj/item/ammo_box/a4570/explosive
- name = "ammo holder (.45-70 explosive)"
- desc = "A 6-round ammo holder for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
+ name = "ammo box (.45-70 explosive)"
+ desc = "A 12-round ammo box for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
icon_state = "4570-explosive"
ammo_type = /obj/item/ammo_casing/a4570/explosive
+
// .38 special Speed Loaders (Colt Detective Special)
/obj/item/ammo_box/c38
name = "speed loader (.38 special)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds do moderate damage, but plink against armor."
- icon_state = "38"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds do okay damage, but struggle against armor."
+ icon_state = "speedloader_38-6"
+ base_icon_state = "speedloader_38"
ammo_type = /obj/item/ammo_casing/c38
+ caliber = ".38"
max_ammo = 6
multiple_sprites = AMMO_BOX_PER_BULLET
custom_materials = list(/datum/material/iron = 15000)
@@ -96,7 +102,7 @@
/obj/item/ammo_box/a858
name = "stripper clip (8x58mm)"
desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration."
- icon_state = "858"
+ icon_state = "enbloc_858"
ammo_type = /obj/item/ammo_casing/caseless/a858
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
@@ -107,7 +113,8 @@
/obj/item/ammo_box/vickland_a308
name = "stripper clip (.308)"
desc = "A 5-round stripper clip for the Vickland Battle Rifle. The Vickland itself has a 10 round capacity, so keep in mind two of these are needed to fully reload it. These rounds do good damage with significant armor penetration."
- icon_state = "308"
+ icon_state = "stripper_308-5"
+ base_icon_state = "stripper_308"
ammo_type = /obj/item/ammo_casing/a308
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
@@ -145,7 +152,8 @@
/obj/item/ammo_box/amagpellet_claris
name = "\improper Claris speed loader (ferromagnetic pellet)"
desc = "A 22-round speed loader for quickly reloading the Claris rifle. Ferromagnetic pellets do okay damage with significant armor penetration."
- icon_state = "claris-sl"
+ icon_state = "claris-sl-1"
+ base_icon_state = "claris-sl"
ammo_type = /obj/item/ammo_casing/caseless/gauss
max_ammo = 22
multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -384,8 +392,10 @@
/obj/item/ammo_box/c45_speedloader
name = "speed loader (.45)"
desc = "Designed to quickly reload revolvers."
- icon_state = "38"
+ icon_state = "speedloader_38-6"
+ base_icon_state = "speedloader_38"
ammo_type = /obj/item/ammo_casing/c45
+ caliber = ".45"
max_ammo = 6
multiple_sprites = AMMO_BOX_PER_BULLET
custom_materials = list(/datum/material/iron = 15000)
@@ -395,7 +405,7 @@
/obj/item/ammo_box/c46x30mm_box
name = "ammo box (4.6x30mm)"
desc = "A box of standard 4.6x30mm ammo."
- icon_state = "4.6x30mmbox"
+ icon_state = "46x30mmbox"
ammo_type = /obj/item/ammo_casing/c46x30mm
max_ammo = 50
@@ -429,7 +439,7 @@
/obj/item/ammo_box/c8x50mmhp_box
name = "ammo box (8x50mm)"
- desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration.."
+ desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration."
icon_state = "8x50mmbox-hp"
ammo_type = /obj/item/ammo_casing/a8_50rhp
max_ammo = 20
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index e96d8d434ddb..66b9238a5c90 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -1,7 +1,8 @@
/obj/item/ammo_box/magazine/m10mm
name = "pistol magazine (10mm)"
desc = "An 8-round single-stack magazine for the stechkin pistol. These rounds do moderate damage, but struggle against armor."
- icon_state = "9x19p"
+ icon_state = "stechkin_mag-1"
+ base_icon_state = "stechkin_mag"
ammo_type = /obj/item/ammo_casing/c10mm
caliber = "10mm"
max_ammo = 8
@@ -10,32 +11,28 @@
/obj/item/ammo_box/magazine/m10mm/inc
name = "pistol magazine (10mm incendiary)"
desc = "An 8-round single-stack magazine for the stechkin pistol. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze."
- icon_state = "9x19pI"
ammo_type = /obj/item/ammo_casing/c10mm/inc
/obj/item/ammo_box/magazine/m10mm/hp
name = "pistol magazine (10mm HP)"
desc = "An 8-round single-stack magazine for the stechkin pistol. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
- icon_state = "9x19pH"
ammo_type = /obj/item/ammo_casing/c10mm/hp
/obj/item/ammo_box/magazine/m10mm/ap
name = "pistol magazine (10mm AP)"
desc = "An 8-round single-stack magazine for the stechkin pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
- icon_state = "9x19pA"
ammo_type = /obj/item/ammo_casing/c10mm/ap
/obj/item/ammo_box/magazine/m10mm/rubber
name = "pistol magazine (10mm rubber)"
desc = "An 8-round handgun magazine for the stechkin pistol. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
- icon_state = "9x19p"
ammo_type = /obj/item/ammo_casing/c10mm/rubber
/obj/item/ammo_box/magazine/m45
name = "pistol magazine (.45)"
desc = "An 8-round single-stack magazine for the Candor pistol. These rounds do moderate damage, but struggle against armor."
- icon_state = "45-8"
- base_icon_state = "45"
+ icon_state = "candor_mag-8"
+ base_icon_state = "candor_mag"
ammo_type = /obj/item/ammo_casing/c45
caliber = ".45"
max_ammo = 8
@@ -65,13 +62,36 @@
icon_state = "[base_icon_state]-[min(ammo_count(), 8)]"
/obj/item/ammo_box/magazine/co9mm
- name = "pistol magazine (9mm)"
- desc = "A 10-round double-stack magazine for standard-issue 9mm pistols. These rounds do okay damage, but struggle against armor."
- icon_state = "co9mm-8"
- base_icon_state = "co9mm"
+ name = "commander pistol magazine (9mm)"
+ desc = "A 10-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
+ icon_state = "commander_mag-10"
+ base_icon_state = "commander_mag"
ammo_type = /obj/item/ammo_casing/c9mm
caliber = "9mm"
max_ammo = 10
+ multiple_sprites = AMMO_BOX_PER_BULLET
+
+/obj/item/ammo_box/magazine/pistol556mm
+ name = "Pistole C magazine (5.56mm HITP caseless)"
+ desc = "A 12-round, double-stack magazine for the Pistole C pistol. These rounds do okay damage with average performance against armor."
+ icon_state = "pistolec_mag-12" //ok i did it
+ base_icon_state = "pistolec_mag"
+ ammo_type = /obj/item/ammo_casing/caseless/c556mm
+ caliber = "5.56mm caseless"
+ max_ammo = 12
+
+/obj/item/ammo_box/magazine/pistol556mm/update_icon_state()
+ . = ..()
+ if(ammo_count() == 12)
+ icon_state = "[base_icon_state]-12"
+ else if(ammo_count() >= 10)
+ icon_state = "[base_icon_state]-10"
+ else if(ammo_count() >= 5)
+ icon_state = "[base_icon_state]-5"
+ else if(ammo_count() >= 1)
+ icon_state = "[base_icon_state]-1"
+ else
+ icon_state = "[base_icon_state]-0"
/obj/item/ammo_box/magazine/co9mm/inc
name = "pistol magazine (9mm incendiary)"
@@ -100,20 +120,18 @@
/obj/item/ammo_box/magazine/pistolm9mm
name = "large pistol magazine (9mm)"
desc = "A long, 15-round double-stack magazine designed for the stechkin APS pistol. These rounds do okay damage, but struggle against armor."
- icon_state = "9x19p-8"
- base_icon_state = "9x19p"
+ icon_state = "stechkin_mag-1"
+ base_icon_state = "stechkin_mag"
ammo_type = /obj/item/ammo_casing/c9mm
caliber = "9mm"
max_ammo = 15
-
-/obj/item/ammo_box/magazine/pistolm9mm/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/m50
name = "handgun magazine (.50 AE)"
desc = "An oversized, 7-round handgun magazine for the Desert Eagle handgun. These rounds do significant damage with average performance against armor."
- icon_state = "50ae"
+ icon_state = "deagle_mag-7"
+ base_icon_state = "deagle_mag"
ammo_type = /obj/item/ammo_casing/a50AE
caliber = ".50 AE"
max_ammo = 7
@@ -122,7 +140,8 @@
/obj/item/ammo_box/magazine/disposable
name = "part of a disposable gun"
desc = "You ripped out part of the gun, somehow, rendering it unusuable. I hope you're happy."
- icon_state = "45-8"
+ icon_state = "himehabu_mag-10"
+ base_icon_state = "himehabu_mag"
ammo_type = /obj/item/ammo_casing/c22lr
caliber = ".22lr"
max_ammo = 10
@@ -140,8 +159,10 @@
/obj/item/ammo_box/magazine/m22lr
name = "pistol magazine (.22 LR)"
desc = "A single-stack handgun magazine designed to chamber .22 LR. It's rather tiny, all things considered."
- icon_state = "pistol_22lr"
+ icon_state = "himehabu_mag-10"
+ base_icon_state = "himehabu_mag"
ammo_type = /obj/item/ammo_casing/c22lr
caliber = "22lr"
max_ammo = 10
w_class = WEIGHT_CLASS_TINY
+ multiple_sprites = AMMO_BOX_PER_BULLET
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 60712700c314..548350f20415 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -14,7 +14,8 @@
/obj/item/ammo_box/magazine/m556
name = "toploader magazine (5.56x45mm)"
desc = "An advanced, 30-round toploading magazine for the M-90gl Carbine. These rounds do moderate damage with good armor penetration."
- icon_state = "5.56m"
+ icon_state = "5.56m-1"
+ base_icon_state = "5.56m"
ammo_type = /obj/item/ammo_casing/a556_39
caliber = "5.56x45mm"
max_ammo = 30
@@ -40,38 +41,32 @@
ammo_type = /obj/item/ammo_casing/c46x30mm
caliber = "4.6x30mm"
max_ammo = 30
- base_icon_state = "skm_mag"
- icon_state = "skm_mag"
-
-/obj/item/ammo_box/magazine/skm_545_39/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[!!ammo_count()]"
+ base_icon_state = "skmcarbine_mag"
+ icon_state = "skmcarbine_mag-1"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/skm_762_40
name = "assault rifle magazine (7.62x40mm CLIP)"
desc = "A slightly curved, 20-round magazine for the 7.62x40mm CLIP variants of the SKM assault rifle family. These rounds do good damage with good armor penetration."
base_icon_state = "skm_mag"
- icon_state = "skm_mag"
+ icon_state = "skm_mag-1"
ammo_type = /obj/item/ammo_casing/a762_40
caliber = "7.62x40mm"
max_ammo = 20
-
-/obj/item/ammo_box/magazine/skm_762_40/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[!!ammo_count()]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/skm_762_40/extended
name = "extended assault rifle magazine (7.62x40mm CLIP)"
desc = "A very curved, 40-round magazine for the 7.62x40mm CLIP variants of the SKM assault rifle family. These rounds do good damage with good armor penetration."
base_icon_state = "skm_extended_mag"
- icon_state = "skm_extended_mag"
+ icon_state = "skm_extended_mag-1"
max_ammo = 40
/obj/item/ammo_box/magazine/skm_762_40/drum
name = "assault rifle drum (7.62x40mm CLIP)"
desc = "A 75-round drum for the 7.62x40mm CLIP variants of the SKM assault rifle family. These rounds do good damage with good armor penetration."
base_icon_state = "skm_drum"
- icon_state = "skm_drum"
+ icon_state = "skm_drum-1"
max_ammo = 75
w_class = WEIGHT_CLASS_NORMAL
@@ -90,49 +85,42 @@
/obj/item/ammo_box/magazine/gal
name = "\improper GAL Magazine (.308)"
desc = "A standard 10-round magazine for GAL platform DMRs. These rounds do good damage with significant armor penetration."
- icon_state = "ebr_mag"
+ icon_state = "gal_mag-1"
+ base_icon_state = "gal_mag"
ammo_type = /obj/item/ammo_casing/a308
caliber = ".308"
max_ammo = 10
-
-/obj/item/ammo_box/magazine/gal/update_icon_state()
- . = ..()
- icon_state = "galmag-[!!ammo_count()]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/p16
name = "assault rifle magazine (5.56x45mm)"
desc = "A simple, 30-round magazine for 5.56x45mm assault rifles. These rounds do moderate damage with good armor penetration."
- icon_state = "p16_mag"
+ icon_state = "p16_mag-1"
+ base_icon_state = "p16_mag"
ammo_type = /obj/item/ammo_casing/a556_39
caliber = "5.56x45mm"
max_ammo = 30
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
-/obj/item/ammo_box/magazine/p16/update_icon_state()
- . = ..()
- icon_state = "p16_mag-[!!ammo_count()]"
/obj/item/ammo_box/magazine/swiss
name = "\improper Swiss Cheese Magazine (5.56x45mm)"
desc = "A deft, 30-round magazine for the Swiss Cheese assault rifle. These rounds do moderate damage with good armor penetration."
- icon_state = "swissmag"
+ icon_state = "swissmag-1"
+ base_icon_state = "swissmag"
ammo_type = /obj/item/ammo_casing/a556_39
caliber = "5.56x45mm"
max_ammo = 30
-
-/obj/item/ammo_box/magazine/swiss/update_icon_state()
- . = ..()
- icon_state = "swissmag-[!!ammo_count()]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/e40
name = "E-40 magazine (.229 Eoehoma caseless)"
- icon_state = "e40_mag"
+ icon_state = "e40_mag-1"
+ base_icon_state = "e40_mag"
ammo_type = /obj/item/ammo_casing/caseless/c299
caliber = ".299 caseless"
max_ammo = 30
-
-/obj/item/ammo_box/magazine/e40/update_icon_state()
- . = ..()
- icon_state = "e40_mag-[!!ammo_count()]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
// 8x50mmR En Bloc Clip (Illestren Hunting Rifle)
@@ -141,6 +129,7 @@
desc = "A 5-round en bloc clip for the Illestren Hunting Rifle. These rounds do good damage with significant armor penetration."
icon_state = "enbloc_858"
ammo_type = /obj/item/ammo_casing/a8_50r
+ caliber = "8x50mmR"
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
index 374f858295e6..3c9aaad1f6f6 100644
--- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
@@ -1,15 +1,13 @@
/obj/item/ammo_box/magazine/m12g
name = "shotgun drum magazine (12g buckshot)"
- desc = "A bulky 8-round drum designed for Scarborough family shotguns."
- icon_state = "m12gb"
+ desc = "A bulky 8-round drum designed for the Bulldog shotgun and it's derivatives."
+ icon_state = "bulldog_drum-1"
+ base_icon_state = "bulldog_drum"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
caliber = "12ga"
max_ammo = 8
w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/ammo_box/magazine/m12g/update_icon_state()
- . = ..()
- icon_state = "m12gb-[!!ammo_count()]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/m12g/stun
name = "shotgun drum magazine (12g taser slugs)"
@@ -31,25 +29,20 @@
name = "shotgun drum magazine (12g meteor slugs)"
ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
-/obj/item/ammo_box/magazine/m12g/small
+/obj/item/ammo_box/magazine/m12g/small //shouldnt this be the parrent intsead of the drum
name = "shotgun box magazine (12g buckshot)"
- desc = "A single-stack, 6-round box magazine for Scarborough family shotguns."
- icon_state = "m12gsmall"
+ desc = "A single-stack, 6-round box magazine for the Bulldog shotgun and it's derivatives."
+ icon_state = "bulldog_mag-1"
+ base_icon_state = "bulldog_mag"
max_ammo = 6
w_class = WEIGHT_CLASS_SMALL //Smaller, holds less
-/obj/item/ammo_box/magazine/m12g/small/update_icon_state()
- . = ..()
- icon_state = "m12gsmall-[!!ammo_count()]"
-
/obj/item/ammo_box/magazine/cm15_mag
name = "CM-15 magazine (12g buckshot)"
- desc = "A curved, 8-round magazine designed for Minutemen shotguns."
- icon_state = "cm15_mag"
+ desc = "An almost straight, 8-round magazine designed for the CM-15 shotgun."
+ icon_state = "cm15_mag-1"
+ base_icon_state = "cm15_mag"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
caliber = "12ga"
max_ammo = 8
-
-/obj/item/ammo_box/magazine/cm15_mag/update_icon_state()
- . = ..()
- icon_state = "cm15_mag-[!!ammo_count()]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
index 7e5f418ec7b2..61b9eb78512a 100644
--- a/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -67,10 +67,10 @@
ammo_type = /obj/item/ammo_casing/c9mm/rubber
/obj/item/ammo_box/magazine/smgm10mm
- name = "SMG magazine (10mm)"
- desc = "A 24-round magazine for the SkM-44(k). These rounds do moderate damage, but struggle against armor."
- icon_state = "smg10mm-24"
- base_icon_state = "smg10mm"
+ name = "Mongrel magazine (10mm)"
+ desc = "A 24-round magazine for the SKM-44v. These rounds do moderate damage, but struggle against armor."
+ icon_state = "mongrel_mag-24"
+ base_icon_state = "mongrel_mag"
ammo_type = /obj/item/ammo_casing/c10mm
caliber = "10mm"
max_ammo = 24
@@ -121,19 +121,6 @@
. = ..()
icon_state = "firestorm_pan"
-/obj/item/ammo_box/magazine/pistol556mm
- name = "handgun magazine (5.56mm HITP caseless)"
- desc = "A 12-round, double-stack magazine for the Pistole C pistol. These rounds do okay damage with average performance against armor."
- icon_state = "5.56mmHITP-12" //ok i did it
- base_icon_state = "5.56mmHITP"
- ammo_type = /obj/item/ammo_casing/caseless/c556mm
- caliber = "5.56mm caseless"
- max_ammo = 12
-
-/obj/item/ammo_box/magazine/pistol556mm/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[round(ammo_count(),2)]"
-
/obj/item/ammo_box/magazine/tec9
name = "machine pistol magazine (9mm AP)"
desc = "A sizable 20-round magazine for the TEC-9 machine pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power.."
diff --git a/code/modules/projectiles/boxes_magazines/external/sniper.dm b/code/modules/projectiles/boxes_magazines/external/sniper.dm
index 25894102905f..b48d76c1295c 100644
--- a/code/modules/projectiles/boxes_magazines/external/sniper.dm
+++ b/code/modules/projectiles/boxes_magazines/external/sniper.dm
@@ -1,27 +1,22 @@
/obj/item/ammo_box/magazine/sniper_rounds
name = "anti-material rifle magazine (.50 BMG)"
desc = "A large, heavy 6-round box magazine designed for the sniper rifle. These rounds deal absurd damage, able to delimb targets, knock them on their feet, and bypass most protective equipment."
- icon_state = ".50mag"
- base_icon_state = ".50mag"
+ icon_state = "50bmgsniper_mag-1"
+ base_icon_state = "50bmgsniper_mag"
ammo_type = /obj/item/ammo_casing/p50
max_ammo = 6
caliber = ".50 BMG"
w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/ammo_box/magazine/sniper_rounds/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state][ammo_count() ? "-ammo" : ""]"
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/sniper_rounds/soporific
name = "anti-material rifle magazine (.50 BMG soporific)"
desc = "A large, heavy 3-round box magazine designed for the sniper rifle. These soporific rounds are completely non-lethal, but render targets asleep for a little under a minute."
- icon_state = "soporific"
ammo_type = /obj/item/ammo_casing/p50/soporific
max_ammo = 3
/obj/item/ammo_box/magazine/sniper_rounds/penetrator
name = "anti-material rifle magazine (.50 BMG penetrator)"
desc = "A large, heavy 5-round box magazine designed for the sniper rifle. These penetrator rounds deal incredible damage and will penetrate most structures, though they don't knock down or delimb targets."
- icon_state = "haemorrhage"
ammo_type = /obj/item/ammo_casing/p50/penetrator
max_ammo = 5
diff --git a/code/modules/projectiles/boxes_magazines/external/toy.dm b/code/modules/projectiles/boxes_magazines/external/toy.dm
index ab9656cdf111..608faa67a974 100644
--- a/code/modules/projectiles/boxes_magazines/external/toy.dm
+++ b/code/modules/projectiles/boxes_magazines/external/toy.dm
@@ -21,7 +21,8 @@
/obj/item/ammo_box/magazine/toy/pistol
name = "foam force pistol magazine"
desc = "A toy pistol magazine designed to fit harmless foam darts."
- icon_state = "9x19p"
+ icon_state = "stechkin_mag-1"
+ base_icon_state = "stechkin_mag"
max_ammo = 8
multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -49,8 +50,8 @@
/obj/item/ammo_box/magazine/toy/m762
name = "donksoft box magazine"
desc = "A huge toy LMG magazine designed to fit vast quantities of harmless foam darts."
- icon_state = "a850r-toy"
- base_icon_state = "a850r"
+ icon_state = "a762-100"
+ base_icon_state = "a762"
caliber = "foam_force"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
max_ammo = 50
@@ -62,5 +63,4 @@
/obj/item/ammo_box/magazine/toy/m762/riot
desc = "A huge toy LMG magazine designed to fit vast quantities of legally-harmless riot control darts."
- icon_state = "a850r-riot"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index f2cb9504dde7..227abceffa01 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -122,7 +122,7 @@
. += "[icon_state]_suppressor"
if (magazine)
if (special_mags)
- . += "[icon_state]_mag_[initial(magazine.icon_state)]"
+ . += "[icon_state]_mag_[magazine.base_icon_state]"
if (!magazine.ammo_count())
. += "[icon_state]_mag_empty"
else
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index c7d73c5459bc..614aa7a884c1 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -4,6 +4,7 @@
/obj/item/gun/ballistic/revolver/grenadelauncher//this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
desc = "A break-action, single-shot grenade launcher. A compact way to deliver a big boom."
name = "grenade launcher"
+ icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "dshotgun_sawn"
item_state = "gun"
mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 737a0f4e2029..81344fa5a82a 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -445,6 +445,7 @@
name = "hook modified sawn-off shotgun"
desc = "Range isn't an issue when you can bring your victim to you."
icon_state = "hookshotgun"
+ icon = 'icons/obj/guns/projectile.dmi'
item_state = "shotgun"
load_sound = 'sound/weapons/gun/shotgun/insert_shell.ogg'
mag_type = /obj/item/ammo_box/magazine/internal/shot/bounty
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 4fb79f7d46e6..4c924ef49ccf 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -187,7 +187,6 @@
/obj/item/gun/energy/laser/iot/lethal
desc = "An energy shotgun with an integrated computer system for surveillance and statistics tracking. This one appears to be modified to fire lethal beams."
- icon_state = "iotshotgun_lethal"
ammo_type = list(/obj/item/ammo_casing/energy/laser/ultima)
/obj/item/gun/energy/laser/hitscanpistol
diff --git a/code/modules/projectiles/guns/energy/mounted.dm b/code/modules/projectiles/guns/energy/mounted.dm
index 89114e805df4..4dc5cae77558 100644
--- a/code/modules/projectiles/guns/energy/mounted.dm
+++ b/code/modules/projectiles/guns/energy/mounted.dm
@@ -16,7 +16,7 @@
name = "mounted laser"
desc = "An arm mounted cannon that fires lethal lasers."
icon = 'icons/obj/items_cyborg.dmi'
- icon_state = "laser"
+ icon_state = "laser_cyborg"
item_state = "armcannonlase"
force = 5
selfcharge = 1
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index 23093e5d8d51..20bcdc4e63d9 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -281,8 +281,8 @@
credit_card_details = H.get_bank_account()
if(H in gun_owners)
if(multi_payment && credit_card_details)
- if(credit_card_details.adjust_money(-payment_amount))
- pin_owner.registered_account.adjust_money(payment_amount)
+ if(credit_card_details.has_money(payment_amount))
+ pin_owner.registered_account.transfer_money(credit_card_details, payment_amount)
return TRUE
to_chat(user, "ERROR: User balance insufficent for successful transaction! ")
return FALSE
@@ -295,8 +295,8 @@
return FALSE
switch(license_request)
if("Yes")
- if(credit_card_details.adjust_money(-payment_amount))
- pin_owner.registered_account.adjust_money(payment_amount)
+ if(credit_card_details.has_money(payment_amount))
+ pin_owner.registered_account.transfer_money(credit_card_details, payment_amount)
gun_owners += H
to_chat(user, "Gun license purchased, have a secure day! ")
active_prompt = FALSE
diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm
index 6d4890290575..c29c692b7e78 100644
--- a/code/modules/projectiles/projectile/energy/ebow.dm
+++ b/code/modules/projectiles/projectile/energy/ebow.dm
@@ -12,6 +12,7 @@
/obj/projectile/energy/bolt/halloween
name = "candy corn"
icon_state = "candy_corn"
+ icon = 'icons/obj/food/food.dmi'
/obj/projectile/energy/bolt/large
damage = 20
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 97e0b7c0946b..ee288feb0bac 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -176,7 +176,7 @@ Borg Shaker
/obj/item/reagent_containers/borghypo/borgshaker
name = "cyborg shaker"
desc = "An advanced drink synthesizer and mixer."
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "shaker"
possible_transfer_amounts = list(5,10,20)
charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
@@ -243,7 +243,7 @@ Borg Shaker
/obj/item/reagent_containers/borghypo/borgshaker/hacked
name = "cyborg shaker"
desc = "Will mix drinks that knock them dead."
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "threemileislandglass"
possible_transfer_amounts = list(5,10,20)
charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 3710a25f3aab..5645ed54957e 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -87,7 +87,7 @@
/obj/item/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"
desc = "A small bottle. Contains the liquid essence of the gods."
- icon = 'icons/obj/drinks.dmi'
+ icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "holyflask"
list_reagents = list(/datum/reagent/medicine/adminordrazine = 30)
can_have_cap = FALSE
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
index 3b9aaceb9f4e..84d948f7c2b9 100644
--- a/code/modules/research/bepis.dm
+++ b/code/modules/research/bepis.dm
@@ -101,7 +101,7 @@
if(!account.has_money(deposit_value))
say("You do not possess enough credits.")
return
- account.adjust_money(-deposit_value) //The money vanishes, not paid to any accounts.
+ account.adjust_money(-deposit_value, "bepis") //The money vanishes, not paid to any accounts.
SSblackbox.record_feedback("amount", "BEPIS_credits_spent", deposit_value)
log_econ("[deposit_value] credits were inserted into [src] by [account.account_holder]")
banked_cash += deposit_value
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 9e16f4fb18b1..f580502e0b7a 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -798,9 +798,9 @@
build_path = /obj/item/weaponcrafting/receiver
category = list("hacked", "Security")
-/datum/design/c38
+/datum/design/c38_surplus
name = "Ammo Box (.38 surplus)"
- id = "c38"
+ id = "c38_surplus"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000)
build_path = /obj/item/ammo_box/c38_box/surplus
diff --git a/code/modules/ruins/icemoonruin_code/library.dm b/code/modules/ruins/icemoonruin_code/library.dm
index 7376d242c52a..b8639e190d7f 100644
--- a/code/modules/ruins/icemoonruin_code/library.dm
+++ b/code/modules/ruins/icemoonruin_code/library.dm
@@ -21,12 +21,3 @@
/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary2
name = "diary entry 18"
default_raw_text = "I've lost track of time. I lack the strength to even pick up books off the shelves. To think, after all this time spent searching for the library, I will die before I can so much as graze the depths of its knowledge."
-
-/obj/item/feather
- name = "feather"
- desc = "A dark, wilting feather. It seems as old as time."
- icon = 'icons/obj/objects.dmi'
- icon_state = "feather"
- force = 0
- throwforce = 0
- w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index c00a62546b3f..2603d9ea3e24 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -277,7 +277,7 @@
if(account)
if(account.account_balance < threshold - payees[AM])
- account.adjust_money(-account.account_balance)
+ account.adjust_money(-account.account_balance, "luxury_shuttle")
payees[AM] += account.account_balance
else
var/money_owed = threshold - payees[AM]
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 7de9e83581fe..b030899d04c2 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -120,7 +120,7 @@
name = "Bluespace Artillery"
desc = "Long range bluespace artillery."
icon = 'icons/obj/lavaland/cannon.dmi'
- icon_state = "orbital_cannon1"
+ icon_state = "cannon_west"
var/static/mutable_appearance/top_layer
var/ex_power = 3
var/power_used_per_shot = 2000000 //enough to kil standard apc - todo : make this use wires instead and scale explosion power with it
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 08ba9bf30e14..05dffd8b4ffd 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -2,7 +2,7 @@
name = BODY_ZONE_HEAD
desc = "Didn't make sense not to live for fun, your brain gets smart but your head gets dumb."
icon = 'icons/mob/human_parts_greyscale.dmi'
- icon_state = "default_human_head"
+ icon_state = "human_head"
max_damage = 200
body_zone = BODY_ZONE_HEAD
body_part = HEAD
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 57d20bc3952a..5f89d15aa95f 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -2,7 +2,7 @@
/obj/item/bodypart/chest
name = BODY_ZONE_CHEST
desc = "It's impolite to stare at a person's chest."
- icon_state = "human_chest"
+ icon_state = "human_chest_m"
max_damage = 200
body_zone = BODY_ZONE_CHEST
body_part = CHEST
diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
index 0e3de53f8838..d389ec5cc56b 100644
--- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
@@ -1,31 +1,37 @@
/obj/item/bodypart/head/ethereal
icon = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_state = "ethereal_head"
limb_id = SPECIES_ETHEREAL
is_dimorphic = FALSE
uses_mutcolor = TRUE
/obj/item/bodypart/chest/ethereal
icon = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_state = "ethereal_chest"
limb_id = SPECIES_ETHEREAL
is_dimorphic = FALSE
uses_mutcolor = TRUE
/obj/item/bodypart/l_arm/ethereal
icon = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_state = "ethereal_l_arm"
limb_id = SPECIES_ETHEREAL
uses_mutcolor = TRUE
/obj/item/bodypart/r_arm/ethereal
icon = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_state = "ethereal_r_arm"
limb_id = SPECIES_ETHEREAL
uses_mutcolor = TRUE
/obj/item/bodypart/leg/left/ethereal
icon = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_state = "ethereal_l_leg"
limb_id = SPECIES_ETHEREAL
uses_mutcolor = TRUE
/obj/item/bodypart/leg/right/ethereal
icon = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_state = "ethereal_r_leg"
limb_id = SPECIES_ETHEREAL
uses_mutcolor = TRUE
diff --git a/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm
index d58d647d57e0..dc162eadfe5e 100644
--- a/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm
@@ -1,6 +1,7 @@
/obj/item/bodypart/head/ipc
static_icon = 'icons/mob/species/ipc/bodyparts.dmi'
icon = 'icons/mob/species/ipc/bodyparts.dmi'
+ icon_state = "synth_head"
limb_id = "synth" //Overriden in /species/ipc/replace_body()
is_dimorphic = FALSE
should_draw_greyscale = FALSE
@@ -16,6 +17,7 @@
/obj/item/bodypart/chest/ipc
static_icon = 'icons/mob/species/ipc/bodyparts.dmi'
icon = 'icons/mob/species/ipc/bodyparts.dmi'
+ icon_state = "synth_chest"
limb_id = "synth"
is_dimorphic = FALSE
should_draw_greyscale = FALSE
@@ -32,6 +34,7 @@
/obj/item/bodypart/l_arm/ipc
static_icon = 'icons/mob/species/ipc/bodyparts.dmi'
icon = 'icons/mob/species/ipc/bodyparts.dmi'
+ icon_state = "synth_l_arm"
limb_id = "synth"
should_draw_greyscale = FALSE
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
@@ -47,6 +50,7 @@
/obj/item/bodypart/r_arm/ipc
static_icon = 'icons/mob/species/ipc/bodyparts.dmi'
icon = 'icons/mob/species/ipc/bodyparts.dmi'
+ icon_state = "synth_r_arm"
limb_id = "synth"
should_draw_greyscale = FALSE
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
@@ -62,6 +66,7 @@
/obj/item/bodypart/leg/left/ipc
static_icon = 'icons/mob/species/ipc/bodyparts.dmi'
icon = 'icons/mob/species/ipc/bodyparts.dmi'
+ icon_state = "synth_l_leg"
limb_id = "synth"
should_draw_greyscale = FALSE
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
@@ -77,6 +82,7 @@
/obj/item/bodypart/leg/right/ipc
static_icon = 'icons/mob/species/ipc/bodyparts.dmi'
icon = 'icons/mob/species/ipc/bodyparts.dmi'
+ icon_state = "synth_r_leg"
limb_id = "synth"
should_draw_greyscale = FALSE
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
diff --git a/code/modules/surgery/bodyparts/species_parts/kepori_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/kepori_bodyparts.dm
index 5764d355db2a..9d512c6e0c16 100644
--- a/code/modules/surgery/bodyparts/species_parts/kepori_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/kepori_bodyparts.dm
@@ -1,5 +1,6 @@
/obj/item/bodypart/head/kepori
icon = 'icons/mob/species/kepori/bodyparts.dmi'
+ icon_state = "kepori_head"
limb_id = SPECIES_KEPORI
uses_mutcolor = TRUE
is_dimorphic = FALSE
@@ -7,6 +8,7 @@
/obj/item/bodypart/chest/kepori
icon = 'icons/mob/species/kepori/bodyparts.dmi'
+ icon_state = "kepori_chest"
uses_mutcolor = TRUE
limb_id = SPECIES_KEPORI
is_dimorphic = FALSE
@@ -15,24 +17,28 @@
/obj/item/bodypart/l_arm/kepori
icon = 'icons/mob/species/kepori/bodyparts.dmi'
+ icon_state = "kepori_l_arm"
uses_mutcolor = TRUE
limb_id = SPECIES_KEPORI
bodytype = BODYTYPE_KEPORI | BODYTYPE_ORGANIC
/obj/item/bodypart/r_arm/kepori
icon = 'icons/mob/species/kepori/bodyparts.dmi'
+ icon_state = "kepori_r_arm"
uses_mutcolor = TRUE
limb_id = SPECIES_KEPORI
bodytype = BODYTYPE_KEPORI | BODYTYPE_ORGANIC
/obj/item/bodypart/leg/left/kepori
icon = 'icons/mob/species/kepori/bodyparts.dmi'
+ icon_state = "kepori_l_leg"
uses_mutcolor = TRUE
limb_id = SPECIES_KEPORI
bodytype = BODYTYPE_KEPORI | BODYTYPE_ORGANIC
/obj/item/bodypart/leg/right/kepori
icon = 'icons/mob/species/kepori/bodyparts.dmi'
+ icon_state = "kepori_r_leg"
uses_mutcolor = TRUE
limb_id = SPECIES_KEPORI
bodytype = BODYTYPE_KEPORI | BODYTYPE_ORGANIC
diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
index 9977afc7ca52..b5be2b890d8c 100644
--- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
@@ -1,32 +1,38 @@
/obj/item/bodypart/head/lizard
icon = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_state = "lizard_head"
limb_id = SPECIES_LIZARD
uses_mutcolor = TRUE
is_dimorphic = FALSE
/obj/item/bodypart/chest/lizard
icon = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_state = "lizard_chest"
uses_mutcolor = TRUE
limb_id = SPECIES_LIZARD
is_dimorphic = FALSE
/obj/item/bodypart/l_arm/lizard
icon = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_state = "lizard_l_arm"
uses_mutcolor = TRUE
limb_id = SPECIES_LIZARD
/obj/item/bodypart/r_arm/lizard
icon = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_state = "lizard_r_arm"
uses_mutcolor = TRUE
limb_id = SPECIES_LIZARD
/obj/item/bodypart/leg/left/lizard
icon = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_state = "lizard_l_leg"
uses_mutcolor = TRUE
limb_id = SPECIES_LIZARD
/obj/item/bodypart/leg/right/lizard
icon = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_state = "lizard_r_leg"
uses_mutcolor = TRUE
limb_id = SPECIES_LIZARD
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 88323f0056a8..24b413fd8f7d 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -135,14 +135,13 @@
/obj/item/disk/surgery
name = "Surgery Procedure Disk"
desc = "A disk that contains advanced surgery procedures, must be loaded into an Operating Console."
- icon_state = "datadisk1"
+ illustration = "med"
custom_materials = list(/datum/material/iron=300, /datum/material/glass=100)
var/list/surgeries
/obj/item/disk/surgery/debug
name = "Debug Surgery Disk"
desc = "A disk that contains all existing surgery procedures."
- icon_state = "datadisk1"
custom_materials = list(/datum/material/iron=300, /datum/material/glass=100)
/obj/item/disk/surgery/debug/Initialize()
diff --git a/code/modules/tgs/LICENSE b/code/modules/tgs/LICENSE
index 85bca8c3f814..8991a68881b4 100644
--- a/code/modules/tgs/LICENSE
+++ b/code/modules/tgs/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2017-2023 Jordan Brown
+Copyright (c) 2017-2024 Jordan Brown
Permission is hereby granted, free of charge,
to any person obtaining a copy of this software and
diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
index 898516f12486..f734fd0527f0 100644
--- a/code/modules/tgs/core/datum.dm
+++ b/code/modules/tgs/core/datum.dm
@@ -7,7 +7,7 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
var/list/warned_deprecated_command_runs
/datum/tgs_api/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version)
- . = ..()
+ ..()
src.event_handler = event_handler
src.version = version
diff --git a/code/modules/tgs/core/tgs_version.dm b/code/modules/tgs/core/tgs_version.dm
index a5dae1241a30..bc561e67487a 100644
--- a/code/modules/tgs/core/tgs_version.dm
+++ b/code/modules/tgs/core/tgs_version.dm
@@ -1,4 +1,5 @@
/datum/tgs_version/New(raw_parameter)
+ ..()
src.raw_parameter = raw_parameter
deprefixed_parameter = replacetext(raw_parameter, "/tg/station 13 Server v", "")
var/list/version_bits = splittext(deprefixed_parameter, ".")
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index afb4beecae14..4b4e10edd7ac 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -62,8 +62,13 @@
#define TEST_OUTPUT_GREEN(text) (text)
#endif
+
#ifdef BASIC_TESTS
+//#include "icons/inhands.dm"
+#include "icons/missing_icons.dm"
+#include "icons/spritesheets.dm"
+#include "icons/worn_icons.dm"
#include "anchored_mobs.dm"
#include "autowiki.dm"
#include "bespoke_id.dm"
diff --git a/code/modules/unit_tests/icons/inhands.dm b/code/modules/unit_tests/icons/inhands.dm
new file mode 100644
index 000000000000..858c6d2f2840
--- /dev/null
+++ b/code/modules/unit_tests/icons/inhands.dm
@@ -0,0 +1,94 @@
+/// Makes sure items with defined item_states... actually have icons that exist!
+/datum/unit_test/defined_item_states
+ var/static/list/possible_icon_states = list()
+ var/fallback_log_message
+ var/unset_inhand_var_message
+ /// additional_inhands_location is for downstream modularity support. as an example, for skyrat's usage, set additional_inhands_location = "modular_skyrat/master_files/icons/mob/inhands/"
+ /// Make sure this location is also present in tools/deploy.sh
+ /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/inhands/") below the if(additional_inhands_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
+ var/additional_inhands_location = null
+
+/datum/unit_test/defined_item_states/proc/generate_possible_icon_states_list(directory_path)
+ if(!directory_path)
+ directory_path = "icons/mob/inhands/"
+ for(var/file_path in flist(directory_path))
+ if(findtext(file_path, ".dmi"))
+ for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
+ possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
+ else
+ possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+
+/datum/unit_test/defined_item_states/Run()
+ generate_possible_icon_states_list()
+ if(additional_inhands_location)
+ generate_possible_icon_states_list(additional_inhands_location)
+
+ //Add EVEN MORE paths if needed here!
+ //generate_possible_icon_states_list("your/folder/path/inhands/")
+
+ for(var/obj/item/item_path as anything in subtypesof(/obj/item))
+ if(initial(item_path.item_flags) & ABSTRACT)
+ continue
+
+ var/skip_left
+ var/skip_right
+
+ var/lefthand_file = initial(item_path.lefthand_file)
+ var/righthand_file = initial(item_path.righthand_file)
+
+ var/item_state = initial(item_path.item_state)
+ if(!item_state)
+ var/base_icon_state = initial(item_path.icon_state)
+ if(!isnull(base_icon_state) && lefthand_file && righthand_file) //Suggest inhand icons that match with the icon_state var.
+ var/missing_var_message
+ if(base_icon_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[base_icon_state])
+ missing_var_message += (missing_var_message ? " & '[file_place]'" : " - Possible matching sprites for \"[base_icon_state]\" found in: '[file_place]'")
+ unset_inhand_var_message += "\n\t[item_path] does not have an item_state value[missing_var_message]"
+ continue
+
+ var/match_message
+ if(item_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[item_state])
+ match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
+
+ if(!(skip_left || skip_right) && !lefthand_file && !righthand_file)
+ TEST_FAIL("Missing both icon files for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
+ continue
+
+ var/missing_left
+ var/left_fallback
+ if(!skip_left)
+ if(!lefthand_file)
+ TEST_FAIL("Missing left inhand icon file for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
+ else
+ missing_left = !icon_exists(lefthand_file, item_state)
+ if(missing_left && icon_exists(lefthand_file, ""))
+ left_fallback = TRUE
+
+ var/missing_right
+ var/right_fallback
+ if(!skip_right)
+ if(!righthand_file)
+ TEST_FAIL("Missing right inhand icon file for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
+ else
+ missing_right = !icon_exists(righthand_file, item_state)
+ if(missing_right && icon_exists(righthand_file, ""))
+ right_fallback = TRUE
+
+ if(missing_right && missing_left)
+ if(!match_message && right_fallback && left_fallback)
+ fallback_log_message += "\n\t[item_path] has invalid value, using fallback icon.\n\titem_state = \"[item_state]\""
+ continue
+ TEST_FAIL("Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")
+ else if(missing_left)
+ TEST_FAIL("Missing left inhand sprite for [item_path] in '[lefthand_file]'[left_fallback ? ", using fallback icon" : null].\n\titem_state = \"[item_state]\"[match_message]")
+ else if(missing_right)
+ TEST_FAIL("Missing right inhand sprite for [item_path] in '[righthand_file]'[right_fallback ? ", using fallback icon" : null].\n\titem_state = \"[item_state]\"[match_message]")
+
+ if(fallback_log_message)
+ TEST_FAIL("Invalid item_state values should be set to null if there isn't a valid icon.[fallback_log_message]")
+
+ if(unset_inhand_var_message)
+ log_test("\tNotice - Possible inhand icon matches found. It is best to be explicit with inhand sprite values.[unset_inhand_var_message]")
+
diff --git a/code/modules/unit_tests/icons/missing_icons.dm b/code/modules/unit_tests/icons/missing_icons.dm
new file mode 100644
index 000000000000..f548d2844a0f
--- /dev/null
+++ b/code/modules/unit_tests/icons/missing_icons.dm
@@ -0,0 +1,57 @@
+/// Makes sure objects actually have icons that exist!
+/datum/unit_test/missing_icons
+ var/static/list/possible_icon_states = list()
+ /// additional_icon_location is for downstream modularity support.
+ /// Make sure this location is also present in tools/deploy.sh
+ /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
+ var/additional_icon_location = null
+
+/datum/unit_test/missing_icons/proc/generate_possible_icon_states_list(directory_path)
+ if(!directory_path)
+ directory_path = "icons/obj/"
+ for(var/file_path in flist(directory_path))
+ if(findtext(file_path, ".dmi"))
+ for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
+ possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
+ else
+ possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+
+/datum/unit_test/missing_icons/Run()
+ generate_possible_icon_states_list()
+ generate_possible_icon_states_list("icons/effects/")
+ if(additional_icon_location)
+ generate_possible_icon_states_list(additional_icon_location)
+
+ //Add EVEN MORE paths if needed here!
+ //generate_possible_icon_states_list("your/folder/path/")
+ var/list/bad_list = list()
+ for(var/obj/obj_path as anything in subtypesof(/obj))
+ if(ispath(obj_path, /obj/item))
+ var/obj/item/item_path = obj_path
+ if(initial(item_path.item_flags) & ABSTRACT)
+ continue
+
+ var/icon = initial(obj_path.icon)
+ if(isnull(icon))
+ continue
+ var/icon_state = initial(obj_path.icon_state)
+ if(isnull(icon_state))
+ continue
+
+ if(length(bad_list) && (icon_state in bad_list[icon]))
+ continue
+
+ if(icon_exists(icon, icon_state))
+ continue
+
+ if(icon_state == "nothing")
+ continue
+
+ bad_list[icon] += list(icon_state)
+
+ var/match_message
+ if(icon_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[icon_state])
+ match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
+ TEST_FAIL("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]")
+
diff --git a/code/modules/unit_tests/icons/spritesheets.dm b/code/modules/unit_tests/icons/spritesheets.dm
new file mode 100644
index 000000000000..c7c16c6535e8
--- /dev/null
+++ b/code/modules/unit_tests/icons/spritesheets.dm
@@ -0,0 +1,11 @@
+///Checks if spritesheet assets contain icon states with invalid names
+/datum/unit_test/spritesheets
+
+/datum/unit_test/spritesheets/Run()
+ for(var/datum/asset/spritesheet/sheet as anything in subtypesof(/datum/asset/spritesheet))
+ if(!initial(sheet.name)) //Ignore abstract types
+ continue
+ sheet = get_asset_datum(sheet)
+ for(var/sprite_name in sheet.sprites)
+ if(!sprite_name)
+ TEST_FAIL("Spritesheet [sheet.type] has a nameless icon state.")
diff --git a/code/modules/unit_tests/icons/worn_icons.dm b/code/modules/unit_tests/icons/worn_icons.dm
new file mode 100644
index 000000000000..eb2d84b73f68
--- /dev/null
+++ b/code/modules/unit_tests/icons/worn_icons.dm
@@ -0,0 +1,116 @@
+/// Makes sure suit slot items aren't using CS:S fallbacks.
+/datum/unit_test/mob_overlay_icons
+ var/static/list/possible_icon_states = list()
+ /// additional_icon_location is for downstream modularity support for finding missing sprites in additonal DMI file locations.
+ /// Make sure this location is also present in tools/deploy.sh
+ /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
+ var/additional_icon_location = null
+
+/datum/unit_test/mob_overlay_icons/proc/generate_possible_icon_states_list(directory_path)
+ if(!directory_path)
+ directory_path = "icons/mob/clothing/"
+ for(var/file_path in flist(directory_path))
+ if(findtext(file_path, ".dmi"))
+ for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword"
+ possible_icon_states[sprite_icon] += list("[directory_path][file_path]")
+ else
+ possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+
+/datum/unit_test/mob_overlay_icons/Run()
+ generate_possible_icon_states_list()
+ if(additional_icon_location)
+ generate_possible_icon_states_list(additional_icon_location)
+
+ var/list/already_warned_icons = list()
+
+ for(var/obj/item/item_path as anything in (subtypesof(/obj/item/clothing)))
+ var/cached_slot_flags = initial(item_path.slot_flags)
+ if(!cached_slot_flags || (cached_slot_flags & ITEM_SLOT_LPOCKET) || (cached_slot_flags & ITEM_SLOT_RPOCKET) || initial(item_path.item_flags) & ABSTRACT)
+ continue
+
+ var/mob_overlay_icon = initial(item_path.mob_overlay_icon) //override icon file. where our sprite is contained if set. (ie modularity stuff)
+ var/mob_overlay_state = initial(item_path.mob_overlay_state) //overrides icon_state.
+ var/icon_state = mob_overlay_state || initial(item_path.icon_state) //icon_state. what sprite name we are looking for.
+
+
+ if(isnull(icon_state))
+ continue //no sprite for the item.
+ if(icon_state in already_warned_icons)
+ continue
+
+ var/match_message
+ if(icon_state in possible_icon_states)
+ for(var/file_place in possible_icon_states[icon_state])
+ match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
+
+ if(mob_overlay_icon) //easiest to check since we override everything. this automatically includes downstream support.
+ if(!(icon_state in icon_states(mob_overlay_icon, 1)))
+ TEST_FAIL("[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in mob_overlay_icon override file, '[mob_overlay_icon]'[match_message]")
+ continue
+
+ var/icon_file //checks against all the default icon locations if one isn't defined.
+ var/fail_reasons
+ var/spacer
+
+
+ if(cached_slot_flags & ITEM_SLOT_BACK)
+ icon_file = 'icons/mob/clothing/back.dmi'
+
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ /*
+ if(cached_slot_flags & ITEM_SLOT_ID)
+ icon_file = 'icons/mob/clothing/id.dmi'
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+ */
+
+ if(cached_slot_flags & ITEM_SLOT_GLOVES)
+ icon_file = 'icons/mob/clothing/hands.dmi'
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_EYES)
+ icon_file = 'icons/mob/clothing/eyes.dmi'
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_EARS)
+ icon_file = 'icons/mob/clothing/ears.dmi'
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_NECK)
+ icon_file = 'icons/mob/clothing/neck.dmi'
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_MASK)
+ icon_file = 'icons/mob/clothing/mask.dmi'
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ if(cached_slot_flags & ITEM_SLOT_BELT)
+ icon_file = 'icons/mob/clothing/belt.dmi'
+ if(!(icon_state in icon_states(icon_file, 1)))
+ already_warned_icons += icon_state
+ fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
+ spacer = "\n\t"
+
+ if(fail_reasons)
+ TEST_FAIL(fail_reasons)
diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm
index fee653cd626f..aca1d210fbf0 100644
--- a/code/modules/unit_tests/outfit_sanity.dm
+++ b/code/modules/unit_tests/outfit_sanity.dm
@@ -19,6 +19,8 @@
r_hand = /obj/item/stack/sheet/glass/five
/datum/unit_test/outfit_sanity/Run()
+ var/datum/outfit/prototype_outfit = /datum/outfit
+ var/prototype_name = initial(prototype_outfit.name)
var/mob/living/carbon/human/H = allocate(/mob/living/carbon/human)
for (var/outfit_type in subtypesof(/datum/outfit))
@@ -27,11 +29,13 @@
qdel(I)
var/datum/outfit/outfit = new outfit_type
+
+ if(outfit.name == prototype_name)
+ TEST_FAIL("[outfit.type]'s name is invalid! Uses default outfit name!")
outfit.pre_equip(H, TRUE)
CHECK_OUTFIT_SLOT(uniform, ITEM_SLOT_ICLOTHING)
CHECK_OUTFIT_SLOT(suit, ITEM_SLOT_OCLOTHING)
- CHECK_OUTFIT_SLOT(back, ITEM_SLOT_BACK)
CHECK_OUTFIT_SLOT(belt, ITEM_SLOT_BELT)
CHECK_OUTFIT_SLOT(gloves, ITEM_SLOT_GLOVES)
CHECK_OUTFIT_SLOT(shoes, ITEM_SLOT_FEET)
@@ -40,11 +44,11 @@
CHECK_OUTFIT_SLOT(neck, ITEM_SLOT_NECK)
CHECK_OUTFIT_SLOT(ears, ITEM_SLOT_EARS)
CHECK_OUTFIT_SLOT(glasses, ITEM_SLOT_EYES)
+ CHECK_OUTFIT_SLOT(back, ITEM_SLOT_BACK)
CHECK_OUTFIT_SLOT(id, ITEM_SLOT_ID)
- CHECK_OUTFIT_SLOT(suit_store, ITEM_SLOT_SUITSTORE)
CHECK_OUTFIT_SLOT(l_pocket, ITEM_SLOT_LPOCKET)
CHECK_OUTFIT_SLOT(r_pocket, ITEM_SLOT_RPOCKET)
-
+ CHECK_OUTFIT_SLOT(suit_store, ITEM_SLOT_SUITSTORE)
if (outfit.backpack_contents || outfit.box)
var/list/backpack_contents = outfit.backpack_contents?.Copy()
if (outfit.box)
diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm
index ef1a324a8e48..f82cb4c6f68e 100644
--- a/code/modules/uplink/uplink_devices.dm
+++ b/code/modules/uplink/uplink_devices.dm
@@ -7,8 +7,8 @@
name = "shortwave radio"
icon = 'icons/obj/radio.dmi'
icon_state = "radio"
- item_state = "walkietalkie"
desc = "A basic handheld radio that communicates with local telecommunication networks."
+ item_state = "radio"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
dog_fashion = /datum/dog_fashion/back
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index 8ea48e4975c1..46d2a76cfe2b 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -2,7 +2,7 @@
name = "generic vehicle"
desc = "Yell at coderbus."
icon = 'icons/obj/vehicles.dmi'
- icon_state = "fuckyou"
+ icon_state = "atv" //Used to be "fuckyou" which hurt my feewings
max_integrity = 300
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
density = TRUE
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index caf9b6afa757..93fcacba45b1 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -54,7 +54,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
integrity_failure = 0.33
armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
circuit = /obj/item/circuitboard/machine/vendor
- var/payment_department = ACCOUNT_SRV
+ var/datum/weakref/payment_account_ref
light_power = 0.5
light_range = MINIMUM_USEFUL_LIGHT_RANGE
clicksound = 'sound/machines/pda_button1.ogg'
@@ -676,7 +676,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
. = list()
.["all_items_free"] = all_items_free
.["miningvendor"] = mining_point_vendor
- .["department"] = payment_department
.["product_records"] = list()
for (var/datum/data/vending_product/R in product_records)
var/list/data = list(
@@ -713,21 +712,18 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/ui_data(mob/user)
. = list()
var/mob/living/carbon/human/H
- var/obj/item/card/id/C
+ var/obj/item/card/id/card
if(ishuman(user))
H = user
- C = H.get_idcard(TRUE)
- if(C)
+ card = H.get_idcard(TRUE)
+ if(card)
.["user"] = list()
- .["user"]["points"] = C.mining_points
- .["user"]["name"] = C.registered_name
- if(C.registered_account)
- .["user"]["name"] = C.registered_account.account_holder
- .["user"]["cash"] = C.registered_account.account_balance
- if(C.registered_account.account_job)
- .["user"]["job"] = C.registered_account.account_job.name
- else
- .["user"]["job"] = "No Job"
+ .["user"]["points"] = card.mining_points
+ .["user"]["name"] = card.registered_name
+ .["user"]["job"] = card.assignment || "No Job"
+ if(card.registered_account)
+ .["user"]["name"] = card.registered_account.account_holder
+ .["user"]["cash"] = card.registered_account.account_balance
.["stock"] = list()
for (var/datum/data/vending_product/R in product_records + coin_records + hidden_records)
.["stock"][R.name] = R.amount
@@ -794,16 +790,19 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
var/datum/bank_account/account = C.registered_account
if(coin_records.Find(R) || hidden_records.Find(R))
price_to_use = R.custom_premium_price ? R.custom_premium_price : extra_price
- if(price_to_use && !account.adjust_money(-price_to_use))
+ if(price_to_use && !account.has_money(price_to_use))
say("You do not possess the funds to purchase [R.name].")
flick(icon_deny,src)
vend_ready = TRUE
return
- var/datum/bank_account/D = SSeconomy.get_dep_account(payment_department)
- if(D)
- D.adjust_money(price_to_use)
- SSblackbox.record_feedback("amount", "vending_spent", price_to_use)
- log_econ("[price_to_use] credits were inserted into [src] by [D.account_holder] to buy [R].")
+
+ var/datum/bank_account/payment_account = payment_account_ref.resolve()
+ if(payment_account)
+ payment_account.transfer_money(account, price_to_use)
+ else
+ account.adjust_money(-price_to_use, "vendor_purchase")
+ SSblackbox.record_feedback("amount", "vending_spent", price_to_use)
+ log_econ("[price_to_use] credits were inserted into [src] by [H] to buy [R].")
if(last_shopper != REF(usr) || purchase_message_cooldown < world.time)
say("Thank you for shopping with [src]!")
purchase_message_cooldown = world.time + 5 SECONDS
@@ -933,7 +932,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
icon_state = "robotics"
icon_deny = "robotics-deny"
max_integrity = 400
- payment_department = NO_FREEBIES
refill_canister = /obj/item/vending_refill/custom
all_items_free = FALSE
/// where the money is sent
@@ -1030,12 +1028,13 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
updateUsrDialog()
return
if(account.has_money(S.custom_price))
- account.adjust_money(-S.custom_price)
var/datum/bank_account/owner = private_a
if(owner)
- owner.adjust_money(S.custom_price)
- SSblackbox.record_feedback("amount", "vending_spent", S.custom_price)
- log_econ("[S.custom_price] credits were spent on [src] buying a [S] by [owner.account_holder], owned by [private_a.account_holder].")
+ owner.transfer_money(account, S.custom_price)
+ else
+ account.adjust_money(-S.custom_price, "vendor_purchase")
+ SSblackbox.record_feedback("amount", "vending_spent", S.custom_price)
+ log_econ("[S.custom_price] credits were spent on [src] buying a [S] by [owner.account_holder], owned by [private_a.account_holder].")
vending_machine_input[N] = max(vending_machine_input[N] - 1, 0)
S.forceMove(drop_location())
loaded_items--
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index 36c3d67c790d..8a1c86cc9536 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -25,7 +25,6 @@
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
default_price = 125
extra_price = 100
- payment_department = NO_FREEBIES
light_mask = "generic-light-mask"
/obj/item/vending_refill/assist
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 4bca9034dd9b..b1d85fb3fcbb 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -132,7 +132,6 @@
refill_canister = /obj/item/vending_refill/autodrobe
default_price = 180
extra_price = 360
- payment_department = ACCOUNT_SRV
light_mask="theater-light-mask"
/obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user)
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 9c7b8622d536..1b7b2d9e5ccb 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -60,7 +60,6 @@
refill_canister = /obj/item/vending_refill/boozeomat
default_price = 120
extra_price = 200
- payment_department = ACCOUNT_SRV
light_mask = "boozeomat-light-mask"
/obj/machinery/vending/boozeomat/all_access
diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm
index 36db52996e1f..b2608b6556f4 100644
--- a/code/modules/vending/cartridge.dm
+++ b/code/modules/vending/cartridge.dm
@@ -16,7 +16,6 @@
refill_canister = /obj/item/vending_refill/cart
default_price = 250
extra_price = 500
- payment_department = ACCOUNT_SRV
light_mask="cart-light-mask"
/obj/item/vending_refill/cart
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index ce2616711d3c..7dd0b6004ea7 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -27,7 +27,6 @@
refill_canister = /obj/item/vending_refill/cigarette
default_price = 75
extra_price = 250
- payment_department = ACCOUNT_SRV
light_mask = "cigs-light-mask"
/obj/machinery/vending/cigarette/syndicate
diff --git a/code/modules/vending/classicbeats.dm b/code/modules/vending/classicbeats.dm
index 0b3fb5c93498..76589b5e479d 100644
--- a/code/modules/vending/classicbeats.dm
+++ b/code/modules/vending/classicbeats.dm
@@ -23,7 +23,6 @@
refill_canister = /obj/item/vending_refill/classicbeats
default_price = 100
extra_price = 60
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/classicbeats
machine_name = "Cuban Pete's Classic Beats"
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 140d8c42a283..8a7199968774 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -127,7 +127,6 @@
refill_canister = /obj/item/vending_refill/clothing
default_price = 60
extra_price = 120
- payment_department = NO_FREEBIES
light_mask = "wardrobe-light-mask"
light_color = LIGHT_COLOR_ELECTRIC_GREEN
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index 67b9878744be..3e45b431b16d 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -15,7 +15,6 @@
refill_canister = /obj/item/vending_refill/coffee
default_price = 45
extra_price = 150
- payment_department = ACCOUNT_SRV
light_mask = "coffee-light-mask"
light_color = COLOR_DARK_MODERATE_ORANGE
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 8be6000ddc69..2ce937979e74 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -27,7 +27,6 @@
refill_canister = /obj/item/vending_refill/cola
default_price = 45
extra_price = 200
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/cola
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 067596091dde..7ff7d80ddccd 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -25,7 +25,6 @@
refill_canister = /obj/item/vending_refill/dinnerware
default_price = 50
extra_price = 250
- payment_department = ACCOUNT_SRV
light_mask = "dinnerware-light-mask"
/obj/item/vending_refill/dinnerware
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index d0f3a3e88725..b5a9d073e8fa 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -31,7 +31,6 @@
refill_canister = /obj/item/vending_refill/engineering
default_price = 450
extra_price = 500
- payment_department = ACCOUNT_ENG
light_mask = "engi-light-mask"
/obj/item/vending_refill/engineering
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index 04b7d26a533e..096bffb1adf7 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -24,7 +24,6 @@
refill_canister = /obj/item/vending_refill/engivend
default_price = 450
extra_price = 500
- payment_department = ACCOUNT_ENG
light_mask = "engivend-light-mask"
/obj/item/vending_refill/engivend
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index ca99c8e4bf34..d209c93eae8e 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -21,7 +21,6 @@
refill_canister = /obj/item/vending_refill/games
default_price = 50
extra_price = 250
- payment_department = ACCOUNT_SRV
light_mask = "games-light-mask"
/obj/item/vending_refill/games
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 015bbdc2c340..ffc1214e6bdf 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -32,5 +32,4 @@
resistance_flags = FIRE_PROOF
default_price = 150
extra_price = 500
- payment_department = ACCOUNT_SEC
light_mask = "liberation-light-mask"
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index 90df6b673b16..fd899f251d25 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -28,5 +28,4 @@
refill_canister = /obj/item/vending_refill/donksoft
default_price = 150
extra_price = 300
- payment_department = ACCOUNT_SRV
light_mask = "donksoft-light-mask"
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index e4489b0a23d8..1fff1bd03398 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -41,7 +41,6 @@
refill_canister = /obj/item/vending_refill/medical
default_price = 250
extra_price = 500
- payment_department = ACCOUNT_MED
light_mask = "med-light-mask"
/obj/item/vending_refill/medical
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 7ba19c75d617..cf0bca7c3bdb 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -23,7 +23,6 @@
refill_canister = /obj/item/vending_refill/wallmed
default_price = 250
extra_price = 500
- payment_department = ACCOUNT_MED
tiltable = FALSE
light_mask = "wallmed-light-mask"
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index bdb3ae4c02eb..899bbac5ea87 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -56,7 +56,6 @@
refill_canister = /obj/item/vending_refill/hydroseeds
default_price = 50
extra_price = 150
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/hydroseeds
machine_name = "MegaSeed Servitor"
diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm
index 2b0c82ba084f..fd9277b895d0 100644
--- a/code/modules/vending/modularpc.dm
+++ b/code/modules/vending/modularpc.dm
@@ -26,7 +26,6 @@
refill_canister = /obj/item/vending_refill/modularpc
default_price = 150
extra_price = 400
- payment_department = ACCOUNT_SCI
/obj/item/vending_refill/modularpc
machine_name = "Deluxe Silicate Selections"
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 753851e53894..1849750d3fce 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -22,7 +22,6 @@
refill_canister = /obj/item/vending_refill/hydronutrients
default_price = 50
extra_price = 150
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/hydronutrients
machine_name = "NutriMax"
diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm
index fdd200edba97..650d9878ad36 100644
--- a/code/modules/vending/plasmaresearch.dm
+++ b/code/modules/vending/plasmaresearch.dm
@@ -14,4 +14,3 @@
contraband = list(/obj/item/assembly/health = 3)
default_price = 400
extra_price = 600
- payment_department = ACCOUNT_SCI
diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm
index e8b377db3dbf..f35b92ebb2d0 100644
--- a/code/modules/vending/robotics.dm
+++ b/code/modules/vending/robotics.dm
@@ -22,7 +22,6 @@
/obj/item/crowbar = 5)
refill_canister = /obj/item/vending_refill/robotics
default_price = 600
- payment_department = ACCOUNT_SCI
/obj/item/vending_refill/robotics
machine_name = "Robotech Deluxe"
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index e4e9d303ae0e..7af332630105 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -27,7 +27,6 @@
refill_canister = /obj/item/vending_refill/security
default_price = 650
extra_price = 700
- payment_department = ACCOUNT_SEC
var/voucher_items = list(
"NT-E-Rifle" = /obj/item/gun/energy/e_gun,
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 5f6a4b6d937a..0785df82f14d 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -22,7 +22,6 @@
canload_access_list = list(ACCESS_KITCHEN)
default_price = 60
extra_price = 160
- payment_department = ACCOUNT_SRV
input_display_header = "Chef's Food Selection"
/obj/item/vending_refill/snack
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index 0f80bf5324bc..f9eff36e5e6c 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -10,7 +10,6 @@
refill_canister = /obj/item/vending_refill/sovietsoda
default_price = 1
extra_price = 1
- payment_department = NO_FREEBIES
light_color = COLOR_PALE_ORANGE
/obj/item/vending_refill/sovietsoda
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index aa8ae97fb112..0519285d26a5 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -18,7 +18,6 @@
refill_canister = /obj/item/vending_refill/sustenance
default_price = 0
extra_price = 0
- payment_department = NO_FREEBIES
/obj/item/vending_refill/sustenance
machine_name = "Sustenance Vendor"
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index 8a938b50d435..5f284718b6f3 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -28,7 +28,6 @@
refill_canister = /obj/item/vending_refill/donksoft
default_price = 150
extra_price = 300
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/donksoft
machine_name = "Donksoft Toy Vendor"
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 549f6f744f1f..933c54f64602 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -4,7 +4,6 @@
/obj/machinery/vending/wardrobe
default_price = 350
extra_price = 450
- payment_department = NO_FREEBIES
input_display_header = "Returned Clothing"
light_mask = "wardrobe-light-mask"
@@ -40,7 +39,6 @@
contraband = list(/obj/item/clothing/head/helmet/justice = 1,
/obj/item/clothing/head/helmet/justice/escape = 1)
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
- payment_department = ACCOUNT_SEC
light_color = COLOR_MOSTLY_PURE_RED
/obj/item/vending_refill/wardrobe/sec_wardrobe
@@ -74,7 +72,6 @@
/obj/item/clothing/accessory/armband/med = 4,
/obj/item/clothing/mask/surgical = 4)
refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
- payment_department = ACCOUNT_MED
/obj/item/vending_refill/wardrobe/medi_wardrobe
machine_name = "MediDrobe"
@@ -101,7 +98,6 @@
/obj/item/clothing/head/hardhat = 3,
/obj/item/clothing/head/hardhat/weldhat = 3)
refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
- payment_department = ACCOUNT_ENG
light_color = COLOR_VIVID_YELLOW
/obj/item/vending_refill/wardrobe/engi_wardrobe
@@ -125,7 +121,6 @@
/obj/item/clothing/shoes/sneakers/black = 3
)
refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
- payment_department = ACCOUNT_ENG
light_color = COLOR_VIVID_YELLOW
/obj/item/vending_refill/wardrobe/atmos_wardrobe
@@ -148,7 +143,6 @@
/obj/item/radio/headset/headset_cargo = 3)
premium = list(/obj/item/clothing/under/rank/cargo/miner = 3)
refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
- payment_department = ACCOUNT_CAR
/obj/item/vending_refill/wardrobe/cargo_wardrobe
machine_name = "CargoDrobe"
@@ -169,12 +163,10 @@
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/mask/bandana/skull = 2
)
- contraband = list(/obj/item/clothing/suit/hooded/techpriest = 2,
- /obj/item/clothing/suit/hooded/enginseer = 2, // WS edit: enginsineer robes
+ contraband = list(/obj/item/clothing/suit/hooded/enginseer = 2, // WS edit: enginsineer robes
/obj/item/organ/tongue/robot = 2)
refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
extra_price = 300
- payment_department = ACCOUNT_SCI
/obj/item/vending_refill/wardrobe/robo_wardrobe
machine_name = "RoboDrobe"
@@ -197,7 +189,6 @@
/obj/item/clothing/head/beret/sci = 3, //WS edit - Berets
/obj/item/clothing/mask/gas = 3)
refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe
- payment_department = ACCOUNT_SCI
/obj/item/vending_refill/wardrobe/science_wardrobe
machine_name = "SciDrobe"
@@ -220,7 +211,6 @@
/obj/item/clothing/mask/bandana = 3,
/obj/item/clothing/accessory/armband/hydro = 3)
refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
- payment_department = ACCOUNT_SRV
light_color = LIGHT_COLOR_ELECTRIC_GREEN
/obj/item/vending_refill/wardrobe/hydro_wardrobe
@@ -247,7 +237,6 @@
/obj/item/clothing/glasses/regular/jamjar = 1,
/obj/item/storage/bag/books = 1)
refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/curator_wardrobe
machine_name = "CuraDrobe"
@@ -282,7 +271,6 @@
/obj/item/clothing/neck/tie/blue = 2)
premium = list(/obj/item/storage/box/dishdrive = 1)
refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/bar_wardrobe
machine_name = "BarDrobe"
@@ -305,13 +293,12 @@
/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
///obj/item/clothing/under/rank/chef = 3,//WS edit - Better security jumpsuit sprites
/obj/item/clothing/head/chefhat = 1,
- /obj/item/clothing/under/rank/civilian/cookjorts = 2,
+ /obj/item/clothing/under/shorts/cookjorts = 2,
/obj/item/clothing/shoes/cookflops = 2,
/obj/item/reagent_containers/glass/rag = 1,
/obj/item/clothing/accessory/armband/med = 4,
/obj/item/clothing/suit/hooded/wintercoat = 2)
refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/chef_wardrobe
machine_name = "ChefDrobe"
@@ -343,7 +330,6 @@
/obj/item/watertank/janitor = 1,
/obj/item/storage/belt/janitor = 2)
refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
- payment_department = ACCOUNT_SRV
light_color = COLOR_STRONG_MAGENTA
/obj/item/vending_refill/wardrobe/jani_wardrobe
@@ -380,7 +366,6 @@
/obj/item/clothing/accessory/armband/deputy = 4,
/obj/item/clothing/accessory/lawyers_badge = 2)
refill_canister = /obj/item/vending_refill/wardrobe/law_wardrobe
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/law_wardrobe
machine_name = "LawDrobe"
@@ -414,7 +399,6 @@
premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
/obj/item/clothing/head/bishopmitre = 1)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
- payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/chap_wardrobe
machine_name = "ChapDrobe"
@@ -435,7 +419,6 @@
/obj/item/storage/bag/chemistry = 2)
contraband = list(/obj/item/reagent_containers/spray/syndicate = 2)
refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
- payment_department = ACCOUNT_MED
/obj/item/vending_refill/wardrobe/chem_wardrobe
machine_name = "ChemDrobe"
@@ -454,7 +437,6 @@
/obj/item/storage/backpack/genetics = 2,
/obj/item/storage/backpack/satchel/gen = 2)
refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
- payment_department = ACCOUNT_SCI
/obj/item/vending_refill/wardrobe/gene_wardrobe
machine_name = "GeneDrobe"
@@ -477,7 +459,6 @@
/obj/item/clothing/head/plaguedoctorhat = 1,
/obj/item/clothing/mask/gas/plaguedoctor = 1)
refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe
- payment_department = ACCOUNT_MED
/obj/item/vending_refill/wardrobe/viro_wardrobe
machine_name = "ViroDrobe"
@@ -507,7 +488,6 @@
premium = list(/obj/item/clothing/head/flatcap = 1)
refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe
extra_price = 350
- payment_department = ACCOUNT_SEC
/obj/item/vending_refill/wardrobe/det_wardrobe
machine_name = "DetDrobe"
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index aadb3c6a5b37..6e75c75c7eae 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -26,4 +26,3 @@
resistance_flags = FIRE_PROOF
default_price = 125
extra_price = 350
- payment_department = ACCOUNT_ENG
diff --git a/html/changelogs/AutoChangeLog-pr-2483.yml b/html/changelogs/AutoChangeLog-pr-2483.yml
deleted file mode 100644
index ec0480153186..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2483.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: MarkSuckerberg
-changes:
- - {server: 515 is required to run shiptest now.}
-delete-after: true
diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml
index fb2b9011b46e..46fb4085b2a2 100644
--- a/html/changelogs/archive/2024-03.yml
+++ b/html/changelogs/archive/2024-03.yml
@@ -202,3 +202,53 @@
2024-03-17:
GenericDM:
- bugfix: pine trees now correctly show all possible sprite variations
+2024-03-22:
+ MarkSuckerberg:
+ - server: 515 is required to run shiptest now.
+2024-03-23:
+ Zevotech:
+ - rscadd: Remapped the Meta-class and changed its faction to NT
+2024-03-26:
+ Gristlebee:
+ - bugfix: speedloaders and en-bloc clips not being able to hold other ammo types
+ of the same caliber
+ - bugfix: 45-70 ammo holders descriptions changed to reflect that they're ammo boxes
+ and hold 12 rounds
+ meemofcourse:
+ - bugfix: Dual sabers should no longer be invisible
+2024-03-27:
+ PositiveEntropy:
+ - bugfix: The 4.6x30mm ammunition box is no longer invisible.
+ SomeguyManperson:
+ - tweak: radiation structures/effects only irradiate their surroundings if near
+ a player
+2024-03-28:
+ Apogee-dev:
+ - tweak: Made the Riggs-class sloop nicer to live in
+ - balance: Removed RnD and ORM from the Riggs
+ FalloutFalcon:
+ - bugfix: extra > in carbon examine
+ - code_imp: various missing icon unit tests
+ - bugfix: to many sprites to name
+ MarkSuckerberg:
+ - tweak: Medical kiosks no longer charge for their service
+ - admin: The economy subsystem now tracks how much money is currently in-round
+ - admin: Adds feedback for the movement of money
+ - rscdel: FULLY removes departmental budgets
+ - rscdel: Removes security record citations
+ PositiveEntropy:
+ - imageadd: Inteq helmets no longer have in-built goggles.
+ retlaw34:
+ - rscadd: adds PGF Sergeant clothing!
+ - rscadd: PGF Captain now has a new cloak design!
+ - balance: PGF armor now has similar stats to bulletproof armor!
+2024-03-29:
+ Gristlebee:
+ - bugfix: 38 Surplus ammo should be printable in the autolathe.
+ - bugfix: 38 speedloader damage blurb is accurate to it's new stats.
+2024-03-31:
+ Gristlebee:
+ - tweak: Geysers can now be plunged with a normal plunger.
+ - tweak: Schmiedeberg's reinforced plunger replaced with a normal plunger
+ - rscdel: Reinforced plungers
+ - imagedel: Reinforced plunger sprites
diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml
new file mode 100644
index 000000000000..4554d939d8b3
--- /dev/null
+++ b/html/changelogs/archive/2024-04.yml
@@ -0,0 +1,21 @@
+2024-04-01:
+ phoaly, coleminerman, MeeMofCourse, Retlaw34:
+ - rscadd: Added the Crying Sun-class
+ - rscadd: Added PGF comms
+2024-04-02:
+ goober3:
+ - tweak: Blood Cult content has been removed from all maps.
+ - rscdel: Jungle_demon.dmm, jungle_witch.dmm, lavaland_surface_cultaltar.dmm, lavaland_surface_fuckedupandevilclub.dmm,
+ clericden.dmm, and rockplanet_cult.dmm have been removed.
+ - tweak: Onehalf.dmm, rockplanet_crash_cult.dmm & icemoon_underground_abandoned_village.dmm
+ have been reworked slightly, to feature no more magic.
+2024-04-08:
+ Apogee-dev:
+ - tweak: Remapped the Shetland
+ - balance: Removed RnD and ORM from Shetland
+ phoaly:
+ - tweak: tweaks supplies and kills the wall laptop on the Ranger
+2024-04-09:
+ Imaginos16, spookywastaken:
+ - rscadd: Resprites a ton of gun magazines
+ - bugfix: Changes how magainzes with only a empty and loaded state are
diff --git a/icons/effects/alphacolors.dmi b/icons/effects/alphacolors.dmi
index c3dbcaee39be..2718f87d36b3 100644
Binary files a/icons/effects/alphacolors.dmi and b/icons/effects/alphacolors.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 4fad073974aa..398d4589ad71 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/head.dmi b/icons/mob/clothing/faction/gezena/head.dmi
index c2c20b63e559..9ce4d05d3c2c 100644
Binary files a/icons/mob/clothing/faction/gezena/head.dmi and b/icons/mob/clothing/faction/gezena/head.dmi differ
diff --git a/icons/mob/clothing/faction/gezena/neck.dmi b/icons/mob/clothing/faction/gezena/neck.dmi
index 9b3fa0c9bbab..50b6d05fa9cc 100644
Binary files a/icons/mob/clothing/faction/gezena/neck.dmi and b/icons/mob/clothing/faction/gezena/neck.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index bdf9ad412de7..56c87efb4a9d 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 29d92de9137a..d705fb48c01f 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index cd64b37eaf3c..9443ebfbc615 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/under/security.dmi b/icons/mob/clothing/under/security.dmi
index 61b1d7983225..d4a18a6ea083 100644
Binary files a/icons/mob/clothing/under/security.dmi and b/icons/mob/clothing/under/security.dmi differ
diff --git a/icons/mob/inhands/clothing/ears_lefthand.dmi b/icons/mob/inhands/clothing/ears_lefthand.dmi
new file mode 100644
index 000000000000..61b186a7b21c
Binary files /dev/null and b/icons/mob/inhands/clothing/ears_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/ears_righthand.dmi b/icons/mob/inhands/clothing/ears_righthand.dmi
new file mode 100644
index 000000000000..39558ef9496e
Binary files /dev/null and b/icons/mob/inhands/clothing/ears_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/glasses_lefthand.dmi b/icons/mob/inhands/clothing/glasses_lefthand.dmi
new file mode 100644
index 000000000000..34c9e47dc24b
Binary files /dev/null and b/icons/mob/inhands/clothing/glasses_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/glasses_righthand.dmi b/icons/mob/inhands/clothing/glasses_righthand.dmi
new file mode 100644
index 000000000000..43282d028c6a
Binary files /dev/null and b/icons/mob/inhands/clothing/glasses_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_lefthand.dmi b/icons/mob/inhands/clothing/gloves_lefthand.dmi
new file mode 100644
index 000000000000..19d3ce28517e
Binary files /dev/null and b/icons/mob/inhands/clothing/gloves_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_righthand.dmi b/icons/mob/inhands/clothing/gloves_righthand.dmi
new file mode 100644
index 000000000000..bca7fd504359
Binary files /dev/null and b/icons/mob/inhands/clothing/gloves_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi
new file mode 100644
index 000000000000..d63c5c7d673a
Binary files /dev/null and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi
new file mode 100644
index 000000000000..c34438f09928
Binary files /dev/null and b/icons/mob/inhands/clothing/hats_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/masks_lefthand.dmi b/icons/mob/inhands/clothing/masks_lefthand.dmi
new file mode 100644
index 000000000000..33be3dfee0b5
Binary files /dev/null and b/icons/mob/inhands/clothing/masks_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/masks_righthand.dmi b/icons/mob/inhands/clothing/masks_righthand.dmi
new file mode 100644
index 000000000000..e34e8cdd2c72
Binary files /dev/null and b/icons/mob/inhands/clothing/masks_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_lefthand.dmi b/icons/mob/inhands/clothing/shoes_lefthand.dmi
new file mode 100644
index 000000000000..7e1a796f1fcf
Binary files /dev/null and b/icons/mob/inhands/clothing/shoes_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_righthand.dmi b/icons/mob/inhands/clothing/shoes_righthand.dmi
new file mode 100644
index 000000000000..383f01dc49be
Binary files /dev/null and b/icons/mob/inhands/clothing/shoes_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi
new file mode 100644
index 000000000000..8b9fa5256a93
Binary files /dev/null and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi
new file mode 100644
index 000000000000..989b7c0860ae
Binary files /dev/null and b/icons/mob/inhands/clothing/suits_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index f5f95c211298..aa8808f81ef2 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index f626c077ced5..9211c2998e49 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/misc/devices_lefthand.dmi b/icons/mob/inhands/misc/devices_lefthand.dmi
index b84d8a8978ce..3acab744f0b7 100644
Binary files a/icons/mob/inhands/misc/devices_lefthand.dmi and b/icons/mob/inhands/misc/devices_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/devices_righthand.dmi b/icons/mob/inhands/misc/devices_righthand.dmi
index 47e3260c6ef6..4d23e421625f 100644
Binary files a/icons/mob/inhands/misc/devices_righthand.dmi and b/icons/mob/inhands/misc/devices_righthand.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 7149896332b2..8bbcb7817714 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/head.dmi b/icons/obj/clothing/faction/gezena/head.dmi
index 11454b333921..faf3c7ac11ef 100644
Binary files a/icons/obj/clothing/faction/gezena/head.dmi and b/icons/obj/clothing/faction/gezena/head.dmi differ
diff --git a/icons/obj/clothing/faction/gezena/neck.dmi b/icons/obj/clothing/faction/gezena/neck.dmi
index 19d51f6a64ae..89617ced9bbf 100644
Binary files a/icons/obj/clothing/faction/gezena/neck.dmi and b/icons/obj/clothing/faction/gezena/neck.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 7a1b973759c1..4025f70990f6 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 4342a2780f9c..cbe3366557f0 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
index a81ec697719f..9eaa67f04a42 100644
Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ
diff --git a/icons/obj/clothing/under/security.dmi b/icons/obj/clothing/under/security.dmi
index 32aea700793d..67e8868958f4 100644
Binary files a/icons/obj/clothing/under/security.dmi and b/icons/obj/clothing/under/security.dmi differ
diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi
index 02d8e138b970..1a2fcad74b84 100644
Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index 1617d733b94b..b34b3777adac 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/drinks/bottle.dmi b/icons/obj/drinks/bottle.dmi
new file mode 100644
index 000000000000..cf74d73796c8
Binary files /dev/null and b/icons/obj/drinks/bottle.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks/drinks.dmi
similarity index 100%
rename from icons/obj/drinks.dmi
rename to icons/obj/drinks/drinks.dmi
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index aca64240a1cc..118ce7693637 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi
index 7c2699e7cdc1..232ecdb35e02 100644
Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 0856132a4751..12798b6eb2ac 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index ad6944ebbbcd..90354fdf41db 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/wallcloset.dmi b/icons/obj/wallcloset.dmi
index 15e2e5e65171..6d41f0ecee85 100644
Binary files a/icons/obj/wallcloset.dmi and b/icons/obj/wallcloset.dmi differ
diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi
index 6483f97570d1..4fefb4a22bfc 100644
Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ
diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi
index c670e677d226..9fb84aa888c2 100644
Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 7652322fdfd1..16cc956b5f73 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -47,6 +47,7 @@ em {font-style: normal; font-weight: bold;}
.pirradio {color: #a30000;}
.clipradio {color: #337296;}
.irmgradio {color: #885231;}
+.pgfradio {color: #127a35;}
.syndradio {color: ##612425;}
.centcomradio {color: #686868;}
.aiprivradio {color: #ff00ff;}
diff --git a/shiptest.dme b/shiptest.dme
index 9efd5074c4d0..e35f2fc6d941 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -983,6 +983,7 @@
#include "code\game\MapData\shuttles\misc.dm"
#include "code\game\MapData\shuttles\nanotrasen_mimir.dm"
#include "code\game\MapData\shuttles\nanotrasen_ranger.dm"
+#include "code\game\MapData\shuttles\pgf_crying_sun.dm"
#include "code\game\MapData\shuttles\srm_elder.dm"
#include "code\game\mecha\mech_bay.dm"
#include "code\game\mecha\mech_fabricator.dm"
@@ -1425,6 +1426,7 @@
#include "code\game\objects\structures\plaques\static_plaques.dm"
#include "code\game\objects\structures\signs\_signs.dm"
#include "code\game\objects\structures\signs\signs_departments.dm"
+#include "code\game\objects\structures\signs\signs_flags.dm"
#include "code\game\objects\structures\signs\signs_maps.dm"
#include "code\game\objects\structures\signs\signs_warning.dm"
#include "code\game\objects\structures\transit_tubes\station.dm"
diff --git a/strings/ship_names.json b/strings/ship_names.json
index 53f56af55559..3ba64b050a09 100644
--- a/strings/ship_names.json
+++ b/strings/ship_names.json
@@ -1237,5 +1237,32 @@
"Wagner's Will",
"Weaver",
"Xenobane"
+ ],
+
+ "PGF": [
+ "Life and Liberty",
+ "Democracy Manifest",
+ "Aggressive Diplomacy",
+ "Spaceward Expansion",
+ "Liberator",
+ "Legislative Dispatch",
+ "Unfettered",
+ "Carte Blanche",
+ "We Built This Yesterday",
+ "Zohil Wept",
+ "Paves-Great-Roads",
+ "Flowers of Liberty",
+ "Hearts and Minds",
+ "Lightspeed Brigade",
+ "Funding for Democracy",
+ "Full-Tilt",
+ "Federal Judgement",
+ "Spear of Lihmona",
+ "Ethorbor Fire",
+ "Green Wings",
+ "Gezenan Coast",
+ "Deep Strike",
+ "Ethereal Serpent",
+ "Shock Action"
]
}
diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js
index e2db02bfde3d..94ce7aa51cf3 100644
--- a/tgui/packages/tgui-panel/chat/constants.js
+++ b/tgui/packages/tgui-panel/chat/constants.js
@@ -61,7 +61,7 @@ export const MESSAGE_TYPES = [
name: 'Radio',
description: 'All departments of radio messages',
selector:
- '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .clipradio, .irmgradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
+ '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .clipradio, .irmgradio, .pgfradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
},
{
type: MESSAGE_TYPE_INFO,
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 4ce7f6fcbef5..8e734f25da41 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -362,6 +362,10 @@ em {
color: #2681a5;
}
+.pgfradio {
+ color: #199943;
+}
+
.solgovradio {
color: #7589af;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index e200bd425569..ae52ba0bfd88 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -374,6 +374,10 @@ em {
color: #885231;
}
+.pgfradio {
+ color: #127a35;
+}
+
.syndradio {
color: #612425;
}
diff --git a/tgui/packages/tgui/interfaces/BankMachine.js b/tgui/packages/tgui/interfaces/BankMachine.js
index 21087ed7c904..8c7732dea095 100644
--- a/tgui/packages/tgui/interfaces/BankMachine.js
+++ b/tgui/packages/tgui/interfaces/BankMachine.js
@@ -4,11 +4,11 @@ import { Window } from '../layouts';
export const BankMachine = (props, context) => {
const { act, data } = useBackend(context);
- const { current_balance, siphoning, station_name } = data;
+ const { current_balance, siphoning, ship_name } = data;
return (
-
+
{
const MedicalKioskInstructions = (props, context) => {
const { act, data } = useBackend(context);
- const { kiosk_cost, patient_name } = data;
+ const { patient_name } = data;
return (
Greetings Valued Employee! Please select a desired automatic health
- check procedure. Diagnosis costs {kiosk_cost} credits.
+ check procedure.
diff --git a/tgui/packages/tgui/interfaces/Secrets.js b/tgui/packages/tgui/interfaces/Secrets.js
index b9a3da5dcbc9..51bb3bb39c09 100644
--- a/tgui/packages/tgui/interfaces/Secrets.js
+++ b/tgui/packages/tgui/interfaces/Secrets.js
@@ -375,33 +375,6 @@ const FunTab = (props, context) => {
/>
-
-
- act('eagles')}
- />
-
-
- act('ancap')}
- />
-
-
+