From 99eee425a514e7a3ab906ee9208297e1dd15687f Mon Sep 17 00:00:00 2001 From: Aylong Date: Sun, 7 Jan 2024 03:47:11 +0200 Subject: [PATCH] Merge Tweaks --- .../map_files220/MetaStation/MetaStation.dmm | 12 +- .../RandomRuins/SpaceRuins/whiteship.dmm | 4 +- .../RandomZLevels/blackmarketpackers.dmm | 4 +- .../RandomZLevels/gate_lizard.dmm | 4 +- _maps/map_files220/RandomZLevels/wildwest.dmm | 2 +- _maps/map_files220/cyberiad/cyberiad.dmm | 6 +- _maps/map_files220/delta/delta.dmm | 10 +- _maps/map_files220/generic/Admin_Zone.dmm | 16 +- _maps/map_files220/generic/centcomm.dmm | 109 ++----- modular_ss220/aesthetics/_aesthetics.dme | 1 - modular_ss220/aesthetics/boxes/code/boxes.dm | 295 ------------------ modular_ss220/gateway/code/exile.dm | 36 +-- modular_ss220/gateway/code/gateway.dm | 2 +- modular_ss220/outfits/code/outfits.dm | 10 +- 14 files changed, 87 insertions(+), 424 deletions(-) delete mode 100644 modular_ss220/aesthetics/boxes/code/boxes.dm diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index 7e29e3e7b655..44ce8c9b69ca 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -22562,7 +22562,7 @@ "bCm" = ( /obj/machinery/economy/vending/cigarette{ pixel_y = 2; - products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate=7,/obj/item/storage/fancy/cigarettes/cigpack_uplift=3,/obj/item/storage/fancy/cigarettes/cigpack_robust=2,/obj/item/storage/fancy/cigarettes/cigpack_carp=3,/obj/item/storage/fancy/cigarettes/cigpack_midori=1,/obj/item/storage/box/matches=10,/obj/item/lighter/random=4) + products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate=7,/obj/item/storage/fancy/cigarettes/cigpack_uplift=3,/obj/item/storage/fancy/cigarettes/cigpack_robust=2,/obj/item/storage/fancy/cigarettes/cigpack_carp=3,/obj/item/storage/fancy/cigarettes/cigpack_midori=1,/obj/item/storage/fancy/matches=10,/obj/item/lighter/random=4) }, /turf/simulated/floor/wood, /area/station/command/office/captain) @@ -24120,7 +24120,7 @@ /area/station/service/bar) "bHQ" = ( /obj/structure/table/reinforced, -/obj/item/storage/box/matches{ +/obj/item/storage/fancy/matches{ pixel_y = 5 }, /turf/simulated/floor/plasteel{ @@ -28891,7 +28891,7 @@ /area/station/science/robotics/showroom) "bYg" = ( /obj/structure/table/wood, -/obj/item/storage/box/matches{ +/obj/item/storage/fancy/matches{ pixel_x = -2; pixel_y = 3 }, @@ -48305,7 +48305,7 @@ "eVz" = ( /obj/structure/table, /obj/item/storage/fancy/rollingpapers, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/item/seeds/tobacco, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -70501,7 +70501,7 @@ /obj/item/toy/crayon/white{ pixel_y = -4 }, -/obj/item/implanter{ +/obj/item/bio_chip_implanter{ pixel_x = 5; pixel_y = 12 }, @@ -71454,7 +71454,7 @@ /obj/item/candle{ pixel_x = -5 }, -/obj/item/storage/box/matches{ +/obj/item/storage/fancy/matches{ pixel_x = 1; pixel_y = -1 }, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm index 7f547e2b3dde..0a4f029ba84e 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm @@ -634,7 +634,7 @@ in_use = 1; pixel_y = -9 }, -/obj/item/clothing/suit/space/hardsuit/medical, +/obj/item/mod/control/pre_equipped/medical, /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "oB" = ( @@ -974,7 +974,7 @@ /area/shuttle/abandoned) "xr" = ( /obj/structure/rack, -/obj/item/clothing/suit/space/hardsuit/medical, +/obj/item/mod/control/pre_equipped/medical, /obj/item/clothing/mask/breath, /obj/machinery/atmospherics/unary/vent_scrubber{ name = "standard air scrubber"; diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index ef3956d9de24..70888ba807fc 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -4478,7 +4478,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Armory) "vl" = ( -/obj/item/clothing/suit/space/hardsuit/medical, +/obj/item/mod/control/pre_equipped/medical, /turf/space, /area/space) "vr" = ( @@ -6285,7 +6285,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_med, /obj/item/storage/fancy/cigarettes, /obj/item/storage/fancy/cigarettes/dromedaryco, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/machinery/light/small/directional/west, /obj/structure/cable{ icon_state = "2-4" diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index a5085f015980..541121815f81 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -10099,7 +10099,7 @@ /obj/item/clothing/mask/balaclava, /obj/item/clothing/head/officer, /obj/item/clothing/under/color/red, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/structure/closet, /obj/item/storage/fancy/cigarettes/cigpack_robust, /obj/item/storage/belt/fannypack, @@ -14012,7 +14012,7 @@ "rHT" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/effect/decal/cleanable/cobweb2, /obj/item/clothing/mask/cigarette/pipe, /turf/simulated/floor/wood/oak, diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm index 8e5681865074..4721a0588752 100644 --- a/_maps/map_files220/RandomZLevels/wildwest.dmm +++ b/_maps/map_files220/RandomZLevels/wildwest.dmm @@ -3117,7 +3117,7 @@ icon_state = "mining" }, /obj/item/clothing/under/plasmaman/mining, -/obj/item/clothing/suit/space/hardsuit/mining, +/obj/item/mod/control/pre_equipped/mining/asteroid, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "ED" = ( diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 6f770705876b..14f84816fd05 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -22015,7 +22015,7 @@ "bIM" = ( /obj/structure/table/wood, /obj/item/radio/intercom/directional/south, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/item/reagent_containers/food/drinks/flask/gold, /obj/item/clothing/mask/cigarette/cigar, /obj/item/razor{ @@ -55839,7 +55839,7 @@ "hpP" = ( /obj/structure/table, /obj/item/storage/fancy/rollingpapers, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/item/seeds/tobacco, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -68494,7 +68494,7 @@ /obj/item/reagent_containers/syringe/heparin{ pixel_y = 4 }, -/obj/item/implanter/mindshield{ +/obj/item/bio_chip_implanter/mindshield{ pixel_y = 1; pixel_x = -2 }, diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 4902ee333c87..b7dd489da1aa 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -2626,7 +2626,7 @@ /area/station/maintenance/electrical_shop) "aqx" = ( /obj/structure/table/wood, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) "aqy" = ( @@ -54795,7 +54795,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/machinery/light/directional/north, /obj/structure/sign/barsign{ pixel_y = 32 @@ -76847,7 +76847,7 @@ "naA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/item/storage/fancy/cigarettes/cigpack_robust, /obj/effect/spawner/lootdrop/maintenance/three, /turf/simulated/floor/plating, @@ -80776,7 +80776,7 @@ pixel_x = -11; pixel_y = -2 }, -/obj/item/implanter/mindshield{ +/obj/item/bio_chip_implanter/mindshield{ pixel_y = 11; pixel_x = -7 }, @@ -82472,7 +82472,7 @@ /area/station/supply/miningdock) "oJQ" = ( /obj/structure/table/wood, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/security/permabrig) diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm index 51e307e0c9d3..c794f3ba7784 100644 --- a/_maps/map_files220/generic/Admin_Zone.dmm +++ b/_maps/map_files220/generic/Admin_Zone.dmm @@ -3348,32 +3348,32 @@ /area/holodeck/source_snowfield) "WD" = ( /obj/structure/table/wood, -/obj/item/implanter/adrenalin{ +/obj/item/bio_chip_implanter/adrenalin{ pixel_x = 12; pixel_y = -12 }, -/obj/item/implanter/emp{ +/obj/item/bio_chip_implanter/emp{ pixel_x = 9; pixel_y = -9 }, -/obj/item/implanter/explosive{ +/obj/item/bio_chip_implanter/explosive{ pixel_x = 6; pixel_y = -6 }, -/obj/item/implanter/explosive_macro{ +/obj/item/bio_chip_implanter/explosive_macro{ pixel_x = 3; pixel_y = -3 }, -/obj/item/implanter/freedom, -/obj/item/implanter/krav_maga{ +/obj/item/bio_chip_implanter/freedom, +/obj/item/bio_chip_implanter/krav_maga{ pixel_x = -9; pixel_y = 9 }, -/obj/item/implanter/mindshield{ +/obj/item/bio_chip_implanter/mindshield{ pixel_x = -6; pixel_y = 6 }, -/obj/item/implanter/storage{ +/obj/item/bio_chip_implanter/storage{ pixel_x = -3; pixel_y = 3 }, diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 54961629b0a3..e55dcea3e40d 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -4079,8 +4079,8 @@ /obj/item/organ/internal/cyberimp/eyes/hud/medical, /obj/item/organ/internal/cyberimp/mouth/breathing_tube, /obj/item/organ/internal/cyberimp/mouth/breathing_tube, -/obj/item/implanter/mindshield, -/obj/item/implanter/mindshield, +/obj/item/bio_chip_implanter/mindshield, +/obj/item/bio_chip_implanter/mindshield, /obj/item/organ/internal/cyberimp/arm/combat/centcom, /obj/item/organ/internal/cyberimp/arm/combat/centcom, /obj/item/organ/internal/cyberimp/arm/surgery, @@ -7299,8 +7299,8 @@ /obj/item/organ/internal/cyberimp/eyes/hud/medical, /obj/item/organ/internal/cyberimp/mouth/breathing_tube, /obj/item/organ/internal/cyberimp/mouth/breathing_tube, -/obj/item/implanter/mindshield, -/obj/item/implanter/mindshield, +/obj/item/bio_chip_implanter/mindshield, +/obj/item/bio_chip_implanter/mindshield, /obj/item/organ/internal/cyberimp/arm/surgery, /obj/item/organ/internal/cyberimp/arm/toolset, /obj/item/organ/internal/cyberimp/arm/janitorial, @@ -14168,12 +14168,6 @@ /obj/item/toy/plushie/corgi, /turf/simulated/floor/grass/jungle, /area/centcom/ss220/library) -"jxt" = ( -/obj/structure/ore_box, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "jxO" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -15022,12 +15016,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_elite) -"kjx" = ( -/obj/effect/turf_decal/delivery/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "kjH" = ( /obj/structure/table/wood/fancy/black, /obj/structure/chair/stool/bar{ @@ -16190,7 +16178,7 @@ /area/centcom/ss220/command) "leH" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /obj/effect/turf_decal/woodsiding{ dir = 1 }, @@ -16635,7 +16623,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/storage/box/matches{ +/obj/item/storage/fancy/matches{ pixel_x = 4; pixel_y = -10 }, @@ -21839,32 +21827,32 @@ /turf/simulated/floor/carpet/arcade, /area/centcom/ss220/general) "pag" = ( -/obj/item/implanter/adrenalin{ +/obj/item/bio_chip_implanter/adrenalin{ pixel_x = 12; pixel_y = -12 }, -/obj/item/implanter/emp{ +/obj/item/bio_chip_implanter/emp{ pixel_x = 9; pixel_y = -9 }, -/obj/item/implanter/explosive{ +/obj/item/bio_chip_implanter/explosive{ pixel_x = 6; pixel_y = -6 }, -/obj/item/implanter/explosive_macro{ +/obj/item/bio_chip_implanter/explosive_macro{ pixel_x = 3; pixel_y = -3 }, -/obj/item/implanter/freedom, -/obj/item/implanter/krav_maga{ +/obj/item/bio_chip_implanter/freedom, +/obj/item/bio_chip_implanter/krav_maga{ pixel_x = -9; pixel_y = 9 }, -/obj/item/implanter/mindshield{ +/obj/item/bio_chip_implanter/mindshield{ pixel_x = -6; pixel_y = 6 }, -/obj/item/implanter/storage{ +/obj/item/bio_chip_implanter/storage{ pixel_x = -3; pixel_y = 3 }, @@ -25715,15 +25703,6 @@ }, /turf/simulated/floor/carpet/cyan, /area/centcom/ss220/general) -"rNu" = ( -/obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "rNA" = ( /obj/structure/closet/crate/secure/bin{ color = "36373a" @@ -29926,12 +29905,6 @@ }, /turf/simulated/floor/wood/fancy/oak, /area/centcom/ss220/bar) -"uLd" = ( -/obj/effect/turf_decal/delivery/red, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "uMm" = ( /obj/structure/flora/tree/jungle, /obj/item/flashlight/lantern{ @@ -33148,7 +33121,7 @@ /area/centcom/ss220/admin2) "wYx" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/item/storage/box/matches, +/obj/item/storage/fancy/matches, /turf/simulated/floor/carpet/black, /area/ghost_bar) "wYC" = ( @@ -33934,15 +33907,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/bar) -"xrm" = ( -/obj/effect/turf_decal/delivery/red, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "xsg" = ( /obj/structure/table/wood, /obj/item/vending_refill/nta, @@ -34230,11 +34194,6 @@ icon_state = "rampbottom" }, /area/syndicate_mothership/elite_squad) -"xBZ" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/syndicate_mothership) "xCo" = ( /obj/vehicle/bike{ dir = 8 @@ -43932,13 +43891,13 @@ fnU gOQ tCJ haI -jxt +jsg ivS ala qsk ovP haI -jxt +jsg gFk gOQ fnU @@ -44188,14 +44147,14 @@ vxx fnU gOQ ocR -xBZ -kjx ovP dJp ovP +dJp +ovP +nRS +jsg nRS -jxt -rNu mpq gOQ gOQ @@ -44445,14 +44404,14 @@ vxx fnU gOQ tCJ -uLd +bcl nlb -xrm +haI jsg -xrm +haI +ovP +bcl ovP -uLd -xBZ oEC gOQ gOQ @@ -48306,10 +48265,10 @@ viA viA lrc dlt -xBZ -xBZ -xBZ -xBZ +ovP +ovP +ovP +ovP cji rJo rJo @@ -48563,10 +48522,10 @@ viA viA viA dlt -xBZ -xBZ -xBZ -xBZ +ovP +ovP +ovP +ovP cji nbn nbn diff --git a/modular_ss220/aesthetics/_aesthetics.dme b/modular_ss220/aesthetics/_aesthetics.dme index 08babc5851f3..6ffb0d8abb86 100644 --- a/modular_ss220/aesthetics/_aesthetics.dme +++ b/modular_ss220/aesthetics/_aesthetics.dme @@ -11,7 +11,6 @@ #include "basketball\code\basketball.dm" #include "better_ids\code\better_ids.dm" #include "blastdoor\code\blastdoor.dm" -#include "boxes\code\boxes.dm" #include "cameras\code\cameras.dm" #include "chairs\code\chairs.dm" #include "closets\code\closets.dm" diff --git a/modular_ss220/aesthetics/boxes/code/boxes.dm b/modular_ss220/aesthetics/boxes/code/boxes.dm deleted file mode 100644 index 7146ba7a3b2f..000000000000 --- a/modular_ss220/aesthetics/boxes/code/boxes.dm +++ /dev/null @@ -1,295 +0,0 @@ -/obj/item/storage/box/survival - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "civ_box" - -/obj/item/storage/box/survival_vox - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "vox_box" - -/obj/item/storage/box/survival_plasmaman - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "plasma_box" - -/obj/item/storage/box/engineer - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "eng_box" - -/obj/item/storage/box/survival_mining - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "min_box" - -/obj/item/storage/box/survival_syndi - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "syndie_box" - -/obj/item/storage/box/gloves - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "latex_box" - -/obj/item/storage/box/masks - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "sterile_box" - -/obj/item/storage/box/syringes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "syringe_box" - -/obj/item/storage/box/beakers - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "beaker_box" - -/obj/item/storage/box/beakers/bluespace - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "beaker_bluespace_box" - -/obj/item/storage/box/iv_bags - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "iv_box" - -/obj/item/storage/box/injectors - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "syringe_box" - -/obj/item/storage/box/flashbangs - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "flashbang_box" - -/obj/item/storage/box/flashes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "flash_box" - -/obj/item/storage/box/teargas - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "teargas_box" - -/obj/item/storage/box/emps - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "emp_box" - -/obj/item/storage/box/trackimp - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/minertracker - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/chemimp - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/exileimp - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/deathimp - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/tapes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "tape_box" - -/obj/item/storage/box/rxglasses - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "glasses_box" - -/obj/item/storage/box/drinkingglasses - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/condimentbottles - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/cups - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "cup_box" - -/obj/item/storage/box/donkpockets - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "donk_box" - -/obj/item/storage/box/syndidonkpockets - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_syndie_box" // TODO: Need new icon - -/obj/item/storage/box/monkeycubes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "monkey_box" - -/obj/item/storage/box/monkeycubes/neaeracubes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "neaera_box" - -/obj/item/storage/box/monkeycubes/stokcubes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "stok_box" - -/obj/item/storage/box/monkeycubes/farwacubes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "farwa_box" - -/obj/item/storage/box/monkeycubes/wolpincubes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "wolpin_box" - -/obj/item/storage/box/permits - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_box" - -/obj/item/storage/box/ids - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_box" - -/obj/item/storage/box/prisoner - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "id_box" - -/obj/item/storage/box/seccarts - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "pda_box" - -/obj/item/storage/box/holobadge - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "badge_box" - -/obj/item/storage/box/evidence - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "evidence_box" - -/obj/item/storage/box/handcuffs - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "handcuff_box" - -/obj/item/storage/box/zipties - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "zipties_box" - -/obj/item/storage/box/alienhandcuffs - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "alien_handcuff_box" - -/obj/item/storage/box/fakesyndiesuit - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "doom_box" - -/obj/item/storage/box/enforcer_rubber - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/enforcer_lethal - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/bartender_rare_ingredients_kit - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/chef_rare_ingredients_kit - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/mousetraps - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "mousetraps_box" - -/obj/item/storage/box/pillbottles - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "pill_box" - -/obj/item/storage/box/patch_packs - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "patch_box" - -/obj/item/storage/box/bodybags - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "bodybag_box" - -/obj/item/storage/box/autoinjectors - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "injector_box" - -/obj/item/storage/box/lights - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "light_box" - -/obj/item/storage/box/lights/tubes - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "lighttube_box" - -/obj/item/storage/box/lights/mixed - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "lightmixed_box" - -/obj/item/storage/box/barber - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/lip_stick - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "implant_box" - -/obj/item/storage/box/centcomofficer - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/responseteam - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "ert_box" - -/obj/item/storage/box/deathsquad - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "doom_box" - -/obj/item/storage/box/soviet - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "soviet_box" - -/obj/item/storage/box/clown - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "clown_box" - -/obj/item/storage/box/emptysandbags - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/rndboards - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/stockparts - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/hug - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "hug_box" - -/obj/item/storage/box/wizard - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "wizard_box" - -/obj/item/storage/box/wizard/hardsuit - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "wizard_box" - -/obj/item/storage/box/breaching - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "flashbang_box" - -/obj/item/storage/box/mindshield - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/dish_drive - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "box" - -/obj/item/storage/box/disks_plantgene - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "disk_box" - -/obj/item/storage/box/disks - icon = 'modular_ss220/aesthetics/boxes/icons/boxes.dmi' - icon_state = "disk_box" diff --git a/modular_ss220/gateway/code/exile.dm b/modular_ss220/gateway/code/exile.dm index a9cf591591b9..048ef4907040 100644 --- a/modular_ss220/gateway/code/exile.dm +++ b/modular_ss220/gateway/code/exile.dm @@ -1,6 +1,6 @@ // Exile implants will allow you to use the station gate, but not return home. // This will allow security to exile badguys/for badguys to exile their kill targets -/obj/item/implant/exile +/obj/item/bio_chip/exile name = "exile bio-chip" desc = "Prevents you from returning from away missions" origin_tech = "materials=2;biotech=3;magnets=2;bluespace=3" @@ -25,30 +25,30 @@ desc = "Box of exile bio-chips. It has a picture of a clown being booted through the Gateway." /obj/item/storage/box/exileimp/populate_contents() - new /obj/item/implanter/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - -/obj/item/implanter/exile + new /obj/item/bio_chip_implanter/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) + +/obj/item/bio_chip_implanter/exile name = "bio-chip implanter (exile)" - implant_type = /obj/item/implant/exile + implant_type = /obj/item/bio_chip/exile -/obj/item/implantcase/exile +/obj/item/bio_chip_case/exile name = "bio-chip case - 'Exile'" desc = "A glass case containing an exile bio-chip." - implant_type = /obj/item/implant/exile + implant_type = /obj/item/bio_chip/exile /obj/structure/closet/secure_closet/exile name = "exile bio-chips" req_access = list(ACCESS_ARMORY) /obj/structure/closet/secure_closet/exile/populate_contents() - new /obj/item/implanter/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) + new /obj/item/bio_chip_implanter/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) + new /obj/item/bio_chip_case/exile(src) diff --git a/modular_ss220/gateway/code/gateway.dm b/modular_ss220/gateway/code/gateway.dm index d4304ab3ab9c..52ac13765c40 100644 --- a/modular_ss220/gateway/code/gateway.dm +++ b/modular_ss220/gateway/code/gateway.dm @@ -282,7 +282,7 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null) M.client.move_delay = max(world.time + 5, M.client.move_delay) /obj/machinery/gateway/centeraway/proc/exilecheck(mob/living/carbon/M) - for(var/obj/item/implant/exile/E in M) // Checking that there is an exile bio-chip in the contents + for(var/obj/item/bio_chip/exile/E in M) // Checking that there is an exile bio-chip in the contents if(E.imp_in == M) // Checking that it's actually implanted vs just in their pocket to_chat(M, span_notice("The station gate has detected your exile bio-chip and is blocking your entry.")) return TRUE diff --git a/modular_ss220/outfits/code/outfits.dm b/modular_ss220/outfits/code/outfits.dm index 5f0ea6cf228f..1e936f0a12fb 100644 --- a/modular_ss220/outfits/code/outfits.dm +++ b/modular_ss220/outfits/code/outfits.dm @@ -23,8 +23,8 @@ /obj/item/clothing/accessory/holster, /obj/item/gun/projectile/automatic/proto ) - implants = list( - /obj/item/implant/mindshield + bio_chips = list( + /obj/item/bio_chip/mindshield ) cybernetic_implants = list( /obj/item/organ/internal/cyberimp/arm/baton, @@ -104,9 +104,9 @@ head = /obj/item/clothing/head/helmet/space/deathsquad/beret/field l_pocket = /obj/item/melee/baseball_bat/homerun/central_command - implants = list( - /obj/item/implant/mindshield, - /obj/item/implant/dust, + bio_chips = list( + /obj/item/bio_chip/mindshield, + /obj/item/bio_chip/dust, /obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, /obj/item/organ/internal/cyberimp/chest/reviver/hardened, /obj/item/organ/internal/cyberimp/eyes/hud/medical,