shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into shield_refactor

Browse Source
This commit is contained in:
kevinz000
2020-03-23 15:34:04 -07:00
parent a6ca854e5c 613c66d88e
commit bf0970d8c3
237 changed files with 14968 additions and 12068 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
+1 -1
View File
@@ -14,7 +14,7 @@
/area/lavaland/surface/outdoors)
"e" = (
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/under/rank/miner/lavaland,
/obj/item/clothing/under/rank/cargo/miner/lavaland,
/obj/effect/decal/remains/human,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+4 -4
View File
@@ -188,10 +188,10 @@
/area/ruin/powered/seedvault)
"G" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/clothing/under/rank/hydroponics,
/obj/item/clothing/under/rank/hydroponics,
/obj/item/clothing/under/rank/hydroponics,
/obj/item/clothing/under/rank/hydroponics,
/obj/item/clothing/under/rank/civilian/hydroponics,
/obj/item/clothing/under/rank/civilian/hydroponics,
/obj/item/clothing/under/rank/civilian/hydroponics,
/obj/item/clothing/under/rank/civilian/hydroponics,
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"H" = (
_maps/RandomRuins/SpaceRuins/DJstation.dmm
+1 -1
View File
@@ -324,7 +324,7 @@
dir = 1
},
/obj/structure/rack,
/obj/item/clothing/under/soviet,
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/head/ushanka,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/djstation)
_maps/RandomRuins/SpaceRuins/advancedlab.dmm
+1 -1
View File
@@ -219,7 +219,7 @@
/obj/structure/closet{
name = "Official Clothing"
},
/obj/item/clothing/under/rank/centcom_commander,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/head/centhat,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/suit/armor/vest,
_maps/RandomRuins/SpaceRuins/crashedship.dmm
+2 -2
View File
@@ -2098,7 +2098,7 @@
/area/awaymission/BMPship/Aft)
"gj" = (
/obj/structure/closet,
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/misc/overalls,
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
"gk" = (
@@ -2269,7 +2269,7 @@
/area/awaymission/BMPship/Aft)
"gP" = (
/obj/structure/closet,
/obj/item/clothing/under/lawyer/bluesuit,
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
/obj/item/clothing/suit/apron,
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
_maps/RandomRuins/SpaceRuins/derelict2.dmm
+2 -2
View File
@@ -64,7 +64,7 @@
/obj/structure/chair{
dir = 4
},
/obj/item/clothing/under/polychromic/shirt,
/obj/item/clothing/under/misc/poly_shirt,
/obj/item/clothing/neck/tie/black,
/obj/item/clothing/shoes/laceup,
/obj/item/storage/wallet/random,
@@ -89,7 +89,7 @@
/obj/structure/chair{
dir = 8
},
/obj/item/clothing/under/polychromic/skirt,
/obj/item/clothing/under/dress/skirt/polychromic,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/glasses/regular,
_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+1 -1
View File
@@ -573,7 +573,7 @@
"bU" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/chair,
/obj/item/clothing/under/rank/centcom_officer,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/restraints/handcuffs,
/obj/effect/decal/remains/human,
/turf/open/floor/plating/airless,
_maps/RandomRuins/LavaRuins/miningbase.dmm → _maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
+7244 -4021
View File
File diff suppressed because it is too large Load Diff
_maps/RandomZLevels/Academy.dmm
+3 -3
View File
@@ -2754,12 +2754,12 @@
"hT" = (
/obj/structure/closet,
/obj/item/storage/belt/soulstone,
/obj/item/clothing/under/schoolgirl,
/obj/item/clothing/under/costume/schoolgirl,
/turf/open/floor/plasteel,
/area/awaymission/academy/academyaft)
"hU" = (
/obj/structure/closet,
/obj/item/clothing/under/skirt/black,
/obj/item/clothing/under/dress/skirt,
/obj/item/clothing/glasses/regular,
/turf/open/floor/plasteel,
/area/awaymission/academy/academyaft)
@@ -2772,7 +2772,7 @@
"hW" = (
/obj/structure/closet,
/obj/item/lipstick/random,
/obj/item/clothing/under/schoolgirl,
/obj/item/clothing/under/costume/schoolgirl,
/turf/open/floor/plasteel,
/area/awaymission/academy/academyaft)
"hX" = (
_maps/RandomZLevels/VR/snowdin_VR.dmm
+1 -1
View File
@@ -2524,7 +2524,7 @@
/area/awaymission/snowdin/post)
"fF" = (
/obj/structure/closet,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/obj/effect/turf_decal/bot,
_maps/RandomZLevels/VR/syndicate_trainer.dmm
+1 -1
View File
@@ -2252,7 +2252,7 @@
/area/awaymission/centcomAway/hangar)
"mQ" = (
/obj/structure/safe/floor,
/obj/item/clothing/under/rank/centcom_officer,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/suit/det_suit,
/obj/item/gun/ballistic/revolver/mateba,
/turf/open/indestructible,
_maps/RandomZLevels/caves.dmm
+1 -1
View File
@@ -580,7 +580,7 @@
/area/awaymission/caves/BMP_asteroid/level_four)
"bH" = (
/obj/effect/decal/remains/human,
/obj/item/clothing/under/patriotsuit,
/obj/item/clothing/under/misc/patriotsuit,
/turf/open/floor/plating/asteroid/basalt/lava{
initial_gas_mix = "n2=23;o2=14"
},
_maps/RandomZLevels/moonoutpost19.dmm
+6 -6
View File
@@ -174,7 +174,7 @@
/obj/structure/bed/nest,
/obj/effect/decal/cleanable/blood/gibs,
/obj/item/clothing/mask/facehugger/impregnated,
/obj/item/clothing/under/rank/security,
/obj/item/clothing/under/rank/security/officer,
/obj/item/clothing/suit/armor/vest,
/obj/item/melee/baton/loaded,
/obj/item/clothing/head/helmet,
@@ -5718,7 +5718,7 @@
name = "personal closet";
req_access_txt = "201"
},
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit/navy,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -6008,7 +6008,7 @@
name = "Kitchen Crate"
},
/obj/item/storage/box/mousetraps,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/suit/waiter,
/turf/open/floor/plasteel/showroomfloor{
heat_capacity = 1e+006;
temperature = 273.15
@@ -6655,7 +6655,7 @@
name = "personal closet";
req_access_txt = "201"
},
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -6823,7 +6823,7 @@
/obj/structure/table,
/obj/structure/bedsheetbin,
/obj/item/clothing/neck/tie/black,
/obj/item/clothing/under/lawyer/blacksuit,
/obj/item/clothing/under/suit/black,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -7068,7 +7068,7 @@
name = "personal closet";
req_access_txt = "201"
},
/obj/item/clothing/under/suit_jacket/burgundy,
/obj/item/clothing/under/suit/burgundy,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
_maps/RandomZLevels/research.dmm
+4 -4
View File
@@ -3214,7 +3214,7 @@
id_job = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/geneticist;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
},
/obj/effect/decal/cleanable/blood,
@@ -4322,7 +4322,7 @@
id_job = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/geneticist;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
},
/obj/effect/decal/cleanable/blood,
@@ -5173,7 +5173,7 @@
id_job = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/geneticist;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
},
/obj/effect/decal/cleanable/blood,
@@ -6047,7 +6047,7 @@
id_job = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/geneticist;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
},
/turf/open/floor/mineral/titanium/blue,
_maps/RandomZLevels/undergroundoutpost45.dmm
+6 -6
View File
@@ -312,7 +312,7 @@
name = "personal closet";
req_access_txt = "201"
},
/obj/item/clothing/under/pj/blue,
/obj/item/clothing/under/misc/pj/blue,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -362,7 +362,7 @@
name = "personal closet";
req_access_txt = "201"
},
/obj/item/clothing/under/suit_jacket/female,
/obj/item/clothing/under/suit/black/skirt,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -2135,7 +2135,7 @@
},
/area/awaymission/undergroundoutpost45/caves)
"ev" = (
/obj/item/clothing/under/pj/red,
/obj/item/clothing/under/misc/pj/red,
/obj/structure/closet/secure_closet{
desc = "It's a secure locker for personnel. The first card swiped gains control.";
icon_state = "cabinet";
@@ -3130,7 +3130,7 @@
name = "Kitchen Crate"
},
/obj/item/storage/box/mousetraps,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/showroomfloor{
heat_capacity = 1e+006
@@ -5263,7 +5263,7 @@
},
/area/awaymission/undergroundoutpost45/gateway)
"km" = (
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit/navy,
/obj/structure/closet/secure_closet{
desc = "It's a secure locker for personnel. The first card swiped gains control.";
icon_state = "cabinet";
@@ -9706,7 +9706,7 @@
name = "personal closet";
req_access_txt = "201"
},
/obj/item/clothing/under/pj/red,
/obj/item/clothing/under/misc/pj/red,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
_maps/map_files/BoxStation/BoxStation.dmm
+111 -111
View File
@@ -363,13 +363,13 @@
name = "formal uniform crate";
req_access = "3"
},
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/warden/navyblue,
/obj/item/clothing/under/rank/head_of_security/navyblue,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/warden/formal,
/obj/item/clothing/under/rank/security/head_of_security/formal,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
@@ -8914,9 +8914,9 @@
dir = 8
},
/obj/structure/closet/wardrobe/white,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/structure/sign/poster/contraband/lizard{
pixel_x = -32
},
@@ -9199,9 +9199,9 @@
"aua" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/skirt/purple,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/dress/skirt/purple,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/beret,
@@ -10189,10 +10189,10 @@
/obj/item/clothing/under/trek/medsci/next,
/obj/item/clothing/under/trek/medsci/next,
/obj/item/clothing/under/trek/medsci/next,
/obj/item/clothing/under/russobluecamooutfit,
/obj/item/clothing/under/russobluecamooutfit,
/obj/item/clothing/under/gladiator,
/obj/item/clothing/under/gladiator,
/obj/item/clothing/under/misc/blue_camo,
/obj/item/clothing/under/misc/blue_camo,
/obj/item/clothing/under/costume/gladiator,
/obj/item/clothing/under/costume/gladiator,
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
@@ -12046,7 +12046,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aBE" = (
/obj/item/clothing/under/rank/mailman,
/obj/item/clothing/under/misc/mailman,
/obj/item/clothing/head/mailman,
/obj/structure/closet,
/obj/effect/landmark/blobstart,
@@ -15259,9 +15259,9 @@
/obj/structure/closet/secure_closet/bar{
req_access_txt = "25"
},
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/gun/ballistic/revolver/doublebarrel,
/turf/open/floor/wood,
/area/crew_quarters/bar)
@@ -18812,8 +18812,8 @@
/obj/machinery/light{
dir = 8
},
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/costume/kilt,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTy" = (
@@ -19331,9 +19331,9 @@
department = "Locker Room";
pixel_x = -32
},
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/color/grey,
/obj/item/clothing/under/color/grey,
/turf/open/floor/plasteel,
@@ -19946,10 +19946,10 @@
"aWn" = (
/obj/structure/closet/wardrobe/black,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/head/beret/black,
@@ -27780,7 +27780,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/obj/item/clothing/under/captainparade,
/obj/item/clothing/under/rank/captain/parade,
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"bpl" = (
@@ -29454,8 +29454,8 @@
/obj/item/clothing/head/beret/black,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/beret,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/skirt/black,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/dress/skirt,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"btj" = (
@@ -29469,8 +29469,8 @@
/area/science/explab)
"btk" = (
/obj/structure/closet/wardrobe/white,
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"btl" = (
@@ -34209,12 +34209,12 @@
"bDJ" = (
/obj/structure/closet/jcloset,
/obj/item/storage/bag/trash,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/under/costume/maid,
/turf/open/floor/plasteel,
/area/janitor)
"bDK" = (
@@ -45760,8 +45760,8 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/misc/overalls,
/obj/item/clothing/under/misc/overalls,
/obj/item/radio/headset/headset_eng,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -45820,8 +45820,8 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/misc/overalls,
/obj/item/clothing/under/misc/overalls,
/obj/item/radio/headset/headset_eng,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -48179,8 +48179,8 @@
"clO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/wardrobe/grey,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/machinery/camera{
c_tag = "Dorms East - Holodeck";
dir = 4
@@ -52491,12 +52491,12 @@
/area/maintenance/starboard/aft)
"cBZ" = (
/obj/structure/table/wood,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"cCb" = (
@@ -54036,10 +54036,10 @@
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/under/russobluecamooutfit,
/obj/item/clothing/under/russobluecamooutfit,
/obj/item/clothing/under/russobluecamooutfit,
/obj/item/clothing/under/russobluecamooutfit,
/obj/item/clothing/under/misc/blue_camo,
/obj/item/clothing/under/misc/blue_camo,
/obj/item/clothing/under/misc/blue_camo,
/obj/item/clothing/under/misc/blue_camo,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
@@ -54237,7 +54237,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"eAG" = (
/obj/item/clothing/under/pj/blue,
/obj/item/clothing/under/misc/pj/blue,
/obj/item/clothing/shoes/sneakers/white,
/turf/open/floor/plating,
/area/maintenance/fore)
@@ -54255,25 +54255,25 @@
/obj/structure/closet{
name = "Suit Closet"
},
/obj/item/clothing/under/suit_jacket/white,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit_jacket/green,
/obj/item/clothing/under/suit_jacket/female,
/obj/item/clothing/under/suit_jacket/checkered,
/obj/item/clothing/under/suit_jacket/charcoal,
/obj/item/clothing/under/suit_jacket/burgundy,
/obj/item/clothing/under/suit_jacket,
/obj/item/clothing/under/lawyer/black,
/obj/item/clothing/under/lawyer/blacksuit,
/obj/item/clothing/under/lawyer/blue,
/obj/item/clothing/under/lawyer/bluesuit,
/obj/item/clothing/under/lawyer/female,
/obj/item/clothing/under/lawyer/purpsuit,
/obj/item/clothing/under/lawyer/really_black,
/obj/item/clothing/under/lawyer/red,
/obj/item/clothing/under/suit/white,
/obj/item/clothing/under/suit/tan,
/obj/item/clothing/under/suit/red,
/obj/item/clothing/under/suit/black_really,
/obj/item/clothing/under/suit/navy,
/obj/item/clothing/under/suit/green,
/obj/item/clothing/under/suit/black/skirt,
/obj/item/clothing/under/suit/checkered,
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/under/suit/burgundy,
/obj/item/clothing/under/suit/black,
/obj/item/clothing/under/rank/civilian/lawyer/black,
/obj/item/clothing/under/suit/black,
/obj/item/clothing/under/rank/civilian/lawyer/blue,
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
/obj/item/clothing/under/rank/civilian/lawyer/female,
/obj/item/clothing/under/rank/civilian/lawyer/purpsuit,
/obj/item/clothing/under/rank/civilian/lawyer/really_black,
/obj/item/clothing/under/rank/civilian/lawyer/red,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"eCR" = (
@@ -55182,7 +55182,7 @@
"hsb" = (
/obj/structure/table/wood,
/obj/item/book/codex_gigas,
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit/red,
/obj/structure/destructible/cult/tome,
/turf/open/floor/carpet,
/area/library)
@@ -56392,25 +56392,25 @@
/obj/structure/closet{
name = "Suit Closet"
},
/obj/item/clothing/under/suit_jacket/white,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit_jacket/green,
/obj/item/clothing/under/suit_jacket/female,
/obj/item/clothing/under/suit_jacket/checkered,
/obj/item/clothing/under/suit_jacket/charcoal,
/obj/item/clothing/under/suit_jacket/burgundy,
/obj/item/clothing/under/suit_jacket,
/obj/item/clothing/under/lawyer/black,
/obj/item/clothing/under/lawyer/blacksuit,
/obj/item/clothing/under/lawyer/blue,
/obj/item/clothing/under/lawyer/bluesuit,
/obj/item/clothing/under/lawyer/female,
/obj/item/clothing/under/lawyer/purpsuit,
/obj/item/clothing/under/lawyer/really_black,
/obj/item/clothing/under/lawyer/red,
/obj/item/clothing/under/suit/white,
/obj/item/clothing/under/suit/tan,
/obj/item/clothing/under/suit/red,
/obj/item/clothing/under/suit/black_really,
/obj/item/clothing/under/suit/navy,
/obj/item/clothing/under/suit/green,
/obj/item/clothing/under/suit/black/skirt,
/obj/item/clothing/under/suit/checkered,
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/under/suit/burgundy,
/obj/item/clothing/under/suit/black,
/obj/item/clothing/under/rank/civilian/lawyer/black,
/obj/item/clothing/under/suit/black,
/obj/item/clothing/under/rank/civilian/lawyer/blue,
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
/obj/item/clothing/under/rank/civilian/lawyer/female,
/obj/item/clothing/under/rank/civilian/lawyer/purpsuit,
/obj/item/clothing/under/rank/civilian/lawyer/really_black,
/obj/item/clothing/under/rank/civilian/lawyer/red,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"lnk" = (
@@ -57515,10 +57515,10 @@
"oZl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/wardrobe/pjs,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/accessory/maidapron,
/obj/machinery/light{
@@ -58179,12 +58179,12 @@
dir = 4
},
/obj/structure/closet/wardrobe/black,
/obj/item/clothing/under/skirt/black,
/obj/item/clothing/under/dress/skirt,
/obj/item/clothing/head/beret/black,
/obj/item/clothing/head/beret/black,
/obj/item/clothing/under/trendy_fit,
/obj/item/clothing/under/trendy_fit,
/obj/item/clothing/under/sundress,
/obj/item/clothing/under/custom/trendy_fit,
/obj/item/clothing/under/custom/trendy_fit,
/obj/item/clothing/under/dress/sundress,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"rtl" = (
@@ -58260,7 +58260,7 @@
/area/security/brig)
"rBq" = (
/obj/item/clothing/head/kitty,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/mask/muzzle,
/turf/open/floor/plating,
/area/maintenance/bar)
@@ -58468,7 +58468,7 @@
/area/maintenance/department/medical/morgue)
"sqg" = (
/obj/structure/table/wood,
/obj/item/clothing/under/pj/red,
/obj/item/clothing/under/misc/pj/red,
/obj/item/clothing/shoes/sneakers/white,
/turf/open/floor/plating,
/area/maintenance/fore)
@@ -59559,8 +59559,8 @@
/area/crew_quarters/fitness/pool)
"vpY" = (
/obj/structure/closet/lasertag/blue,
/obj/item/clothing/under/pj/blue,
/obj/item/clothing/under/pj/blue,
/obj/item/clothing/under/misc/pj/blue,
/obj/item/clothing/under/misc/pj/blue,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"vqP" = (
@@ -60603,8 +60603,8 @@
/area/crew_quarters/fitness)
"xZD" = (
/obj/structure/closet/lasertag/red,
/obj/item/clothing/under/pj/red,
/obj/item/clothing/under/pj/red,
/obj/item/clothing/under/misc/pj/red,
/obj/item/clothing/under/misc/pj/red,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"xZL" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+26 -26
View File
@@ -4154,7 +4154,7 @@
},
/obj/item/wirerod,
/obj/item/wrench,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/accessory/waistcoat,
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
@@ -39822,7 +39822,7 @@
/obj/structure/closet/secure_closet/hos,
/obj/item/clothing/head/HoS/beret,
/obj/item/clothing/suit/armor/hos/trenchcoat,
/obj/item/clothing/under/rank/head_of_security/grey,
/obj/item/clothing/under/rank/security/head_of_security/grey,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -50312,7 +50312,7 @@
/obj/item/clothing/suit/det_suit{
icon_state = "curator"
},
/obj/item/clothing/under/rank/det{
/obj/item/clothing/under/rank/security/detective{
icon_state = "curator"
},
/obj/effect/turf_decal/tile/neutral{
@@ -62632,7 +62632,7 @@
/area/security/warden)
"cbF" = (
/obj/structure/closet/secure_closet/warden,
/obj/item/clothing/under/rank/warden/grey,
/obj/item/clothing/under/rank/security/warden/grey,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -74042,7 +74042,7 @@
/area/maintenance/starboard)
"cuG" = (
/obj/structure/table,
/obj/item/clothing/under/rank/security,
/obj/item/clothing/under/rank/security/officer,
/obj/item/restraints/handcuffs,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small,
@@ -78636,7 +78636,7 @@
pixel_x = 26;
pixel_y = 26
},
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/head/beret,
/obj/machinery/airalarm{
pixel_y = 23
@@ -78674,7 +78674,7 @@
/obj/item/clothing/head/fedora{
icon_state = "detective"
},
/obj/item/clothing/under/geisha,
/obj/item/clothing/under/costume/geisha,
/obj/item/clothing/head/fedora{
icon_state = "curator"
},
@@ -78682,7 +78682,7 @@
desc = "This looks awfully familiar...";
icon_state = "curator"
},
/obj/item/clothing/under/rank/curator/treasure_hunter,
/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -81143,7 +81143,7 @@
icon_state = "1-2"
},
/obj/item/folder/blue,
/obj/item/clothing/under/rank/centcom_commander{
/obj/item/clothing/under/rank/centcom/commander{
desc = "A replica of a jumpsuit worn by the highest ranking commanders under Nanotrasen's central command.";
name = "Replica CentCom officer's jumpsuit"
},
@@ -88556,7 +88556,7 @@
/area/crew_quarters/fitness/recreation)
"cTg" = (
/obj/structure/table,
/obj/item/clothing/under/sl_suit{
/obj/item/clothing/under/suit/sl{
name = "referee suit"
},
/obj/effect/turf_decal/tile/neutral{
@@ -89705,7 +89705,7 @@
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket/letterman_nanotrasen,
/obj/item/clothing/suit/toggle/lawyer,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/head/kitty,
/obj/machinery/airalarm{
dir = 1;
@@ -89733,7 +89733,7 @@
/obj/item/clothing/head/fedora{
icon_state = "detective"
},
/obj/item/clothing/under/lawyer/female,
/obj/item/clothing/under/rank/civilian/lawyer/female,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
@@ -89757,7 +89757,7 @@
pixel_y = -32
},
/obj/item/clothing/head/fedora,
/obj/item/clothing/under/redeveninggown,
/obj/item/clothing/under/dress/redeveninggown,
/obj/item/clothing/head/rabbitears,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
@@ -92803,7 +92803,7 @@
/area/crew_quarters/fitness/recreation)
"dae" = (
/obj/structure/table,
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/under/suit/black_really,
/obj/item/cane,
/obj/item/clothing/head/bowler{
pixel_y = 5
@@ -98184,7 +98184,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
/obj/item/clothing/suit/toggle/owlwings,
/obj/item/clothing/under/owl,
/obj/item/clothing/under/costume/owl,
/obj/item/clothing/mask/gas/owl_mask,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -110502,7 +110502,7 @@
/area/medical/medbay/central)
"dFk" = (
/obj/structure/table/wood,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/head/kitty,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
@@ -111362,7 +111362,7 @@
/area/maintenance/department/medical/morgue)
"dGw" = (
/obj/structure/closet/secure_closet/CMO,
/obj/item/clothing/under/rank/nursesuit,
/obj/item/clothing/under/rank/medical/doctor/nurse,
/obj/item/clothing/head/nursehat,
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -113664,7 +113664,7 @@
/area/crew_quarters/theatre/abandoned)
"dKr" = (
/obj/structure/table/wood,
/obj/item/clothing/under/geisha,
/obj/item/clothing/under/costume/geisha,
/obj/item/clothing/shoes/sandal,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -121170,7 +121170,7 @@
/area/library/abandoned)
"dYm" = (
/obj/structure/table/wood,
/obj/item/clothing/under/rank/curator,
/obj/item/clothing/under/rank/civilian/curator,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
@@ -125929,12 +125929,12 @@
dir = 8
},
/obj/structure/table,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"gbV" = (
@@ -126052,7 +126052,7 @@
/area/science/circuit)
"gVS" = (
/obj/item/clothing/head/kitty,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/mask/muzzle,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
_maps/map_files/KiloStation/KiloStation.dmm
+28 -28
View File
@@ -7053,7 +7053,7 @@
/obj/effect/turf_decal/bot,
/obj/structure/rack,
/obj/item/clothing/gloves/color/brown,
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/misc/overalls,
/obj/item/clothing/mask/gas{
pixel_x = 4;
pixel_y = 4
@@ -9271,7 +9271,7 @@
/obj/structure/closet{
name = "science locker"
},
/obj/item/clothing/under/rank/scientist{
/obj/item/clothing/under/rank/rnd/scientist{
pixel_x = 4;
pixel_y = 4
},
@@ -14495,12 +14495,12 @@
/obj/structure/closet{
name = "skirt closet"
},
/obj/item/clothing/under/skirt/red{
/obj/item/clothing/under/dress/skirt/red{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/under/skirt/blue,
/obj/item/clothing/under/skirt/black{
/obj/item/clothing/under/dress/skirt/blue,
/obj/item/clothing/under/dress/skirt{
pixel_x = -4;
pixel_y = -4
},
@@ -23307,7 +23307,7 @@
/area/science/mixing)
"aLT" = (
/obj/structure/closet,
/obj/item/clothing/under/rank/bartender/purple{
/obj/item/clothing/under/rank/civilian/bartender/purple{
pixel_x = 4;
pixel_y = 4
},
@@ -27296,11 +27296,11 @@
name = "medical locker"
},
/obj/structure/grille/broken,
/obj/item/clothing/under/skirt/blue{
/obj/item/clothing/under/dress/skirt/blue{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical/doctor,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/mask/surgical,
/turf/open/floor/plating,
@@ -27633,7 +27633,7 @@
pixel_x = -26
},
/obj/item/reagent_containers/food/snacks/pie/cream,
/obj/item/clothing/under/lobster,
/obj/item/clothing/under/costume/lobster,
/obj/item/clothing/head/lobsterhat,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -35208,7 +35208,7 @@
/obj/structure/closet{
name = "kitchen closet"
},
/obj/item/clothing/under/rank/chef{
/obj/item/clothing/under/rank/civilian/chef{
pixel_x = 4;
pixel_y = 4
},
@@ -41672,7 +41672,7 @@
/obj/structure/closet/secure_closet/personal,
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/obj/effect/turf_decal/tile/neutral,
@@ -42353,7 +42353,7 @@
/obj/structure/closet{
name = "supply locker"
},
/obj/item/clothing/under/rank/cargotech,
/obj/item/clothing/under/rank/cargo/tech,
/obj/item/clothing/shoes/sneakers/brown,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
@@ -42575,11 +42575,11 @@
/obj/effect/turf_decal/tile/neutral,
/obj/structure/table,
/obj/effect/decal/cleanable/cobweb,
/obj/item/clothing/under/suit_jacket/really_black{
/obj/item/clothing/under/suit/black_really{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/under/suit/black_really,
/obj/item/clothing/neck/tie/black{
pixel_x = 6
},
@@ -42747,7 +42747,7 @@
/obj/structure/closet/secure_closet/personal,
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/obj/effect/turf_decal/tile/neutral,
@@ -49246,8 +49246,8 @@
"byZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/closet/wardrobe/black,
/obj/item/clothing/under/trendy_fit,
/obj/item/clothing/under/trendy_fit,
/obj/item/clothing/under/custom/trendy_fit,
/obj/item/clothing/under/custom/trendy_fit,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"bza" = (
@@ -49915,12 +49915,12 @@
/obj/structure/closet{
name = "suit closet"
},
/obj/item/clothing/under/lawyer/female{
/obj/item/clothing/under/rank/civilian/lawyer/female{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/under/lawyer/bluesuit,
/obj/item/clothing/under/lawyer/red{
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
/obj/item/clothing/under/rank/civilian/lawyer/red{
pixel_x = -4;
pixel_y = -4
},
@@ -55123,7 +55123,7 @@
/area/security/processing)
"bIl" = (
/obj/structure/table,
/obj/item/clothing/under/rank/security{
/obj/item/clothing/under/rank/security/officer{
pixel_x = -4
},
/obj/item/toy/figure/dsquad{
@@ -63053,7 +63053,7 @@
name = "security locker"
},
/obj/item/clothing/gloves/color/black,
/obj/item/clothing/under/rank/security/skirt,
/obj/item/clothing/under/rank/security/officer/skirt,
/obj/item/clothing/shoes/jackboots,
/obj/structure/grille/broken,
/obj/effect/decal/cleanable/cobweb,
@@ -80232,7 +80232,7 @@
/obj/effect/turf_decal/tile/neutral,
/obj/structure/table/wood,
/obj/effect/decal/cleanable/cobweb,
/obj/item/clothing/under/geisha{
/obj/item/clothing/under/costume/geisha{
pixel_y = 5
},
/obj/item/toy/katana,
@@ -81091,7 +81091,7 @@
name = "engineering locker"
},
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/under/rank/engineer,
/obj/item/clothing/under/rank/engineering/engineer,
/obj/item/clothing/shoes/workboots,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt,
@@ -82773,11 +82773,11 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/under/maid{
/obj/item/clothing/under/costume/maid{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/obj/item/clothing/accessory/maidapron{
pixel_x = -4;
pixel_y = -4
@@ -87666,7 +87666,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -88191,7 +88191,7 @@
/area/hallway/primary/fore)
"uqy" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
_maps/map_files/LambdaStation/lambda.dmm
+11 -11
View File
@@ -11069,7 +11069,7 @@
dir = 4
},
/obj/structure/closet/secure_closet/warden,
/obj/item/clothing/under/rank/warden/grey,
/obj/item/clothing/under/rank/security/warden/grey,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -34914,7 +34914,7 @@
light_color = "#e8eaff"
},
/obj/machinery/vending/wardrobe/jani_wardrobe{
products = list(/obj/item/clothing/under/rank/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
},
/turf/open/floor/plating,
/area/janitor)
@@ -44998,7 +44998,7 @@
/area/library)
"bCG" = (
/obj/structure/destructible/cult/tome,
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit/red,
/obj/item/book/codex_gigas,
/turf/open/floor/plasteel/cult{
dir = 2
@@ -64322,12 +64322,12 @@
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"clT" = (
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/structure/closet/crate{
name = "Burial Garment Crate"
},
@@ -65350,7 +65350,7 @@
/area/engine/engineering)
"cnW" = (
/obj/machinery/vending/engineering{
products = list(/obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/sneakers/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4, /obj/item/clothing/glasses/meson/engine = 4, /obj/item/clothing/gloves/color/yellow = 2, /obj/item/screwdriver = 12, /obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/multitool = 12, /obj/item/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5)
products = list(/obj/item/clothing/under/rank/engineering/engineer = 4, /obj/item/clothing/shoes/sneakers/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4, /obj/item/clothing/glasses/meson/engine = 4, /obj/item/clothing/gloves/color/yellow = 2, /obj/item/screwdriver = 12, /obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/multitool = 12, /obj/item/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5)
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
@@ -77113,7 +77113,7 @@
},
/obj/item/clothing/head/HoS/beret,
/obj/item/clothing/suit/armor/hos/trenchcoat,
/obj/item/clothing/under/rank/head_of_security/grey,
/obj/item/clothing/under/rank/security/head_of_security/grey,
/obj/item/storage/box/deputy,
/obj/structure/sign/nanotrasen{
pixel_x = 32;
_maps/map_files/MetaStation/MetaStation.dmm
+34 -34
View File
@@ -4556,7 +4556,7 @@
/area/crew_quarters/fitness/recreation)
"aiR" = (
/obj/structure/table,
/obj/item/clothing/under/sl_suit{
/obj/item/clothing/under/suit/sl{
desc = "Whoever wears this makes the rules.";
name = "referee suit"
},
@@ -6918,8 +6918,8 @@
/area/maintenance/port)
"ana" = (
/obj/structure/rack,
/obj/item/clothing/under/rank/mailman,
/obj/item/clothing/under/rank/vice{
/obj/item/clothing/under/misc/mailman,
/obj/item/clothing/under/misc/vice_officer{
pixel_x = 4;
pixel_y = -3
},
@@ -7555,7 +7555,7 @@
c_tag = "Brig - Infirmary";
dir = 1
},
/obj/item/clothing/under/rank/medical/purple{
/obj/item/clothing/under/rank/medical/doctor/purple{
pixel_y = -4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -8886,7 +8886,7 @@
/obj/structure/chair,
/obj/item/restraints/handcuffs,
/obj/effect/decal/remains/human,
/obj/item/clothing/under/soviet,
/obj/item/clothing/under/costume/soviet,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -9965,7 +9965,7 @@
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"asV" = (
@@ -10042,7 +10042,7 @@
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/item/clothing/under/suit_jacket/burgundy,
/obj/item/clothing/under/suit/burgundy,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"atc" = (
@@ -11693,7 +11693,7 @@
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/suit/tan,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"awE" = (
@@ -13402,11 +13402,11 @@
/area/crew_quarters/dorms)
"aAe" = (
/obj/structure/table,
/obj/item/clothing/under/suit_jacket/female{
/obj/item/clothing/under/suit/black/skirt{
pixel_x = 3;
pixel_y = 1
},
/obj/item/clothing/under/suit_jacket/really_black{
/obj/item/clothing/under/suit/black_really{
pixel_x = -2
},
/obj/machinery/light/small{
@@ -13418,9 +13418,9 @@
},
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/suit/toggle/lawyer/black,
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit/red,
/obj/item/clothing/neck/tie/black,
/obj/item/clothing/under/lawyer/blacksuit,
/obj/item/clothing/under/suit/black,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -14755,7 +14755,7 @@
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit/navy,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aCM" = (
@@ -16789,7 +16789,7 @@
/area/crew_quarters/dorms)
"aGP" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aGQ" = (
@@ -23603,7 +23603,7 @@
/area/maintenance/starboard/fore)
"aUX" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
@@ -26182,7 +26182,7 @@
/area/ai_monitored/turret_protected/ai)
"aZU" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/obj/effect/turf_decal/tile/neutral{
@@ -26345,7 +26345,7 @@
/area/maintenance/port/fore)
"bah" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/structure/sign/map/right{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
icon_state = "map-right-MS";
@@ -27278,7 +27278,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/structure/sign/map/left{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
icon_state = "map-left-MS";
@@ -29748,21 +29748,21 @@
name = "formal uniform crate";
req_access_txt = "3"
},
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/under/rank/warden/navyblue,
/obj/item/clothing/under/rank/security/warden/formal,
/obj/item/clothing/suit/armor/vest/warden/navyblue,
/obj/item/clothing/under/rank/head_of_security/navyblue,
/obj/item/clothing/under/rank/security/head_of_security/formal,
/obj/item/clothing/suit/armor/hos/navyblue,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/head/beret/sec/navyofficer,
@@ -46039,7 +46039,7 @@
},
/obj/structure/table/wood,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/under/suit/black_really,
/obj/item/clothing/glasses/sunglasses,
/obj/machinery/camera{
c_tag = "Corporate Showroom"
@@ -47330,7 +47330,7 @@
/obj/machinery/newscaster{
pixel_x = -30
},
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit/red,
/obj/effect/decal/cleanable/cobweb,
/obj/item/book/codex_gigas,
/turf/open/floor/engine/cult,
@@ -72433,12 +72433,12 @@
pixel_x = -26
},
/obj/structure/table/wood,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"cLW" = (
_maps/map_files/Mining/Lavaland.dmm
+4195 -5142
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/OmegaStation/OmegaStation.dmm
+5 -5
View File
@@ -12660,7 +12660,7 @@
/area/maintenance/port/fore)
"avQ" = (
/obj/structure/table,
/obj/item/clothing/under/rank/security,
/obj/item/clothing/under/rank/security/officer,
/obj/item/restraints/handcuffs,
/obj/structure/cable/white,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -13692,7 +13692,7 @@
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket/letterman_nanotrasen,
/obj/item/clothing/suit/toggle/lawyer,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/obj/machinery/light/small{
dir = 1
},
@@ -13716,7 +13716,7 @@
/obj/item/clothing/head/fedora{
icon_state = "detective"
},
/obj/item/clothing/under/geisha,
/obj/item/clothing/under/costume/geisha,
/obj/machinery/light/small{
dir = 1
},
@@ -17365,7 +17365,7 @@
/obj/item/clothing/head/fedora{
icon_state = "detective"
},
/obj/item/clothing/under/lawyer/female,
/obj/item/clothing/under/rank/civilian/lawyer/female,
/obj/machinery/light/small,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
@@ -17387,7 +17387,7 @@
},
/obj/item/clothing/suit/toggle/lawyer/black,
/obj/item/clothing/head/fedora,
/obj/item/clothing/under/blacktango,
/obj/item/clothing/under/dress/blacktango,
/obj/machinery/light/small,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
_maps/map_files/PubbyStation/PubbyStation.dmm
+12 -12
View File
@@ -18191,7 +18191,7 @@
/obj/structure/chair/wood/normal{
dir = 8
},
/obj/item/clothing/under/janimaid,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/turf/open/floor/wood{
icon_state = "wood-broken"
},
@@ -20830,7 +20830,7 @@
/area/janitor)
"aXP" = (
/obj/structure/table,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/key/janitor,
/obj/item/grenade/clusterbuster/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
@@ -22591,9 +22591,9 @@
"bbt" = (
/obj/structure/disposalpipe/segment,
/obj/structure/table/wood,
/obj/item/clothing/under/sundress,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/blacktango,
/obj/item/clothing/under/dress/sundress,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/dress/blacktango,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"bbu" = (
@@ -22653,7 +22653,7 @@
pixel_x = 6;
pixel_y = -5
},
/obj/item/clothing/under/rank/mailman,
/obj/item/clothing/under/misc/mailman,
/obj/item/clothing/head/mailman,
/turf/open/floor/plasteel,
/area/quartermaster/office)
@@ -35719,7 +35719,7 @@
icon_state = "2-4"
},
/obj/structure/closet,
/obj/item/clothing/under/rank/nursesuit,
/obj/item/clothing/under/rank/medical/doctor/nurse,
/obj/item/clothing/head/nursehat,
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/airalarm{
@@ -51421,10 +51421,10 @@
/turf/open/floor/carpet,
/area/chapel/main/monastery)
"cwz" = (
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial,
/obj/structure/table/wood,
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
@@ -55840,7 +55840,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"klV" = (
/obj/item/clothing/under/rank/clown/sexy,
/obj/item/clothing/under/rank/civilian/clown/sexy,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/crew_quarters/dorms)
"kmd" = (
_maps/map_files/generic/CentCom.dmm
+11 -11
View File
@@ -1711,14 +1711,14 @@
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/obj/item/clothing/under/schoolgirl,
/obj/item/clothing/under/costume/schoolgirl,
/turf/open/floor/holofloor,
/area/holodeck/rec_center/school)
"eD" = (
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/obj/item/clothing/under/schoolgirl/green,
/obj/item/clothing/under/costume/schoolgirl/green,
/turf/open/floor/holofloor,
/area/holodeck/rec_center/school)
"eE" = (
@@ -1832,14 +1832,14 @@
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/obj/item/clothing/under/schoolgirl/orange,
/obj/item/clothing/under/costume/schoolgirl/orange,
/turf/open/floor/holofloor,
/area/holodeck/rec_center/school)
"eU" = (
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/obj/item/clothing/under/schoolgirl/red,
/obj/item/clothing/under/costume/schoolgirl/red,
/turf/open/floor/holofloor,
/area/holodeck/rec_center/school)
"eV" = (
@@ -1934,7 +1934,7 @@
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
/obj/item/clothing/under/schoolgirl,
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/toy/katana,
/turf/open/floor/holofloor,
/area/holodeck/rec_center/school)
@@ -6839,8 +6839,8 @@
/area/centcom/ferry)
"pN" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/rank/curator/treasure_hunter,
/obj/item/clothing/under/skirt/black,
/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
/obj/item/clothing/under/dress/skirt,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/pants/track,
/obj/item/clothing/accessory/armband/deputy,
@@ -17017,11 +17017,11 @@
/turf/open/floor/plasteel/white,
/area/centcom/holding)
"OU" = (
/obj/item/clothing/under/jabroni,
/obj/item/clothing/under/geisha,
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/costume/jabroni,
/obj/item/clothing/under/costume/geisha,
/obj/item/clothing/under/costume/kilt,
/obj/structure/closet,
/obj/item/clothing/under/roman,
/obj/item/clothing/under/costume/roman,
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
"OV" = (
_maps/shuttles/emergency_pubby.dmm
+1 -1
View File
@@ -520,7 +520,7 @@
/obj/structure/window/reinforced,
/obj/structure/table,
/obj/item/storage/bag/tray,
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/suit/waiter,
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/escape)
"bg" = (
_maps/shuttles/ruin_pirate_cutter.dmm
+2 -2
View File
@@ -82,7 +82,7 @@
},
/obj/item/clothing/head/collectable/pirate,
/obj/item/clothing/suit/pirate,
/obj/item/clothing/under/pirate,
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/head/bandana,
/turf/open/floor/plasteel/dark/side{
@@ -387,7 +387,7 @@
},
/obj/item/clothing/head/collectable/pirate,
/obj/item/clothing/suit/pirate,
/obj/item/clothing/under/pirate,
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/head/bandana,
/obj/effect/turf_decal/tile/red{
_maps/shuttles/whiteship_delta.dmm
+2 -2
View File
@@ -909,11 +909,11 @@
dir = 1
},
/obj/item/storage/wallet/random,
/obj/item/clothing/under/rank/centcom_officer{
/obj/item/clothing/under/rank/centcom/officer{
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
/obj/item/clothing/under/rank/centcom_commander{
/obj/item/clothing/under/rank/centcom/commander{
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
code/__DEFINES/citadel_defines.dm
+1 -2
View File
@@ -39,15 +39,14 @@
#define DEF_VAGINA_SHAPE "Human"
#define COCK_SIZE_MIN 1
#define COCK_SIZE_DEF 6
#define COCK_SIZE_MAX 20
#define COCK_DIAMETER_RATIO_MAX 0.42
#define COCK_DIAMETER_RATIO_DEF 0.25
#define COCK_DIAMETER_RATIO_MIN 0.15
#define DEF_COCK_SHAPE "Human"
#define BALLS_VOLUME_BASE 25
#define BALLS_VOLUME_MULT 1
code/__HELPERS/_cit_helpers.dm
-1
View File
@@ -60,7 +60,6 @@ GLOBAL_LIST_EMPTY(genitals_list)
GLOBAL_LIST_EMPTY(cock_shapes_list)
GLOBAL_LIST_EMPTY(gentlemans_organ_names)
GLOBAL_LIST_EMPTY(balls_shapes_list)
GLOBAL_LIST_EMPTY(breasts_size_list)
GLOBAL_LIST_EMPTY(breasts_shapes_list)
GLOBAL_LIST_EMPTY(vagina_shapes_list)
GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc
code/__HELPERS/global_lists.dm
-1
View File
@@ -54,7 +54,6 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ",
"cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret",
"baloney pony", "schlanger", "Mutton dagger", "old blind bob","Hanging Johnny", "fishing rod", "Tally whacker", "polly rocket",
code/__HELPERS/mobs.dm
+3 -2
View File
@@ -194,7 +194,7 @@
"balls_efficiency" = CUM_EFFICIENCY,
"has_breasts" = FALSE,
"breasts_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
"breasts_size" = pick(GLOB.breasts_size_list),
"breasts_size" = pick(CONFIG_GET(keyed_list/breasts_cups_prefs)),
"breasts_shape" = DEF_BREASTS_SHAPE,
"breasts_producing" = FALSE,
"has_vag" = FALSE,
@@ -210,7 +210,8 @@
"ipc_screen" = snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
"ipc_antenna" = "None",
"flavor_text" = "",
"meat_type" = "Mammalian"
"meat_type" = "Mammalian",
"body_model" = MALE
))
/proc/random_hair_style(gender)
code/_globalvars/lists/maintenance_loot.dm
+1 -1
View File
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/clothing/head/welding = 1,
/obj/item/clothing/mask/gas = 15,
/obj/item/clothing/suit/hazardvest = 1,
/obj/item/clothing/under/rank/vice = 1,
/obj/item/clothing/under/misc/vice_officer = 1,
/obj/item/clothing/suit/hooded/flashsuit = 2,
/obj/item/clothing/accessory/medal/greytide = 1,
/obj/item/assembly/prox_sensor = 4,
code/_onclick/other_mobs.dm
+2 -2
View File
@@ -20,7 +20,7 @@
var/override = 0
for(var/datum/mutation/human/HM in dna.mutations)
override += HM.on_attack_hand(src, A, proximity)
override += HM.on_attack_hand(A, proximity)
if(override)
return
@@ -95,7 +95,7 @@
return
for(var/datum/mutation/human/HM in dna.mutations)
HM.on_ranged_attack(src, A, mouseparams)
HM.on_ranged_attack(A, mouseparams)
if(isturf(A) && get_dist(src,A) <= 1)
src.Move_Pulled(A)
code/controllers/configuration/entries/game_options.dm
+13
View File
@@ -423,3 +423,16 @@
config_entry_value = 3
/datum/config_entry/flag/suicide_allowed
/datum/config_entry/keyed_list/breasts_cups_prefs
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_FLAG
config_entry_value = list("a", "b", "c", "d", "e") //keep these lowercase
/datum/config_entry/number/penis_min_inches_prefs
config_entry_value = 1
min_val = 0
/datum/config_entry/number/penis_max_inches_prefs
config_entry_value = 20
min_val = 0
code/controllers/subsystem/traumas.dm
+22 -22
View File
@@ -69,12 +69,12 @@ SUBSYSTEM_DEF(traumas)
"spiders" = typecacheof(list(/obj/structure/spider)),
"security" = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden,
/obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/det,
"security" = typecacheof(list(/obj/item/clothing/under/rank/security/officer, /obj/item/clothing/under/rank/security/warden,
/obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/security/detective,
/obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/restraints/handcuffs,
/obj/machinery/door/airlock/security, /obj/effect/hallucination/simple/securitron)),
"clowns" = typecacheof(list(/obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes,
"clowns" = typecacheof(list(/obj/item/clothing/under/rank/civilian/clown, /obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
/obj/item/pda/clown, /obj/item/grown/bananapeel)),
@@ -87,15 +87,15 @@ SUBSYSTEM_DEF(traumas)
"skeletons" = typecacheof(list(/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton,
/obj/effect/decal/remains/human)),
"conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/head_of_security,
/obj/item/clothing/under/rank/chief_engineer, /obj/item/clothing/under/rank/chief_medical_officer,
/obj/item/clothing/under/rank/head_of_personnel, /obj/item/clothing/under/rank/research_director,
/obj/item/clothing/under/rank/head_of_security/grey, /obj/item/clothing/under/rank/head_of_security/alt,
/obj/item/clothing/under/rank/research_director/alt, /obj/item/clothing/under/rank/research_director/turtleneck,
/obj/item/clothing/under/captainparade, /obj/item/clothing/under/hosparademale, /obj/item/clothing/under/hosparadefem,
"conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/security/head_of_security,
/obj/item/clothing/under/rank/engineering/chief_engineer, /obj/item/clothing/under/rank/medical/chief_medical_officer,
/obj/item/clothing/under/rank/civilian/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director,
/obj/item/clothing/under/rank/security/head_of_security/grey, /obj/item/clothing/under/rank/security/head_of_security/alt,
/obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
/obj/item/clothing/under/rank/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade, /obj/item/clothing/under/rank/security/head_of_security/parade/female,
/obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/abductor/baton,
/obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
/obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom_officer,
/obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/suit/space/hardsuit/ert, /obj/item/clothing/suit/space/hardsuit/ert/sec,
/obj/item/clothing/suit/space/hardsuit/ert/engi, /obj/item/clothing/suit/space/hardsuit/ert/med,
/obj/item/clothing/suit/space/hardsuit/deathsquad, /obj/item/clothing/head/helmet/space/hardsuit/deathsquad,
@@ -103,8 +103,8 @@ SUBSYSTEM_DEF(traumas)
"robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule/, /obj/machinery/recharge_station,
/obj/item/aicard, /obj/item/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)),
"doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical, /obj/item/clothing/under/rank/chemist,
/obj/item/clothing/under/rank/nursesuit, /obj/item/clothing/under/rank/chief_medical_officer,
"doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/doctor/nurse, /obj/item/clothing/under/rank/medical/chief_medical_officer,
/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/hypospray,
/obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/healthanalyzer,
/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper,
@@ -112,10 +112,10 @@ SUBSYSTEM_DEF(traumas)
/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),
"authority" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/head_of_personnel,
/obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/research_director,
/obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/rank/chief_engineer,
/obj/item/clothing/under/rank/centcom_officer, /obj/item/clothing/under/rank/centcom_commander,
"authority" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/civilian/head_of_personnel,
/obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/rnd/research_director,
/obj/item/clothing/under/rank/medical/chief_medical_officer, /obj/item/clothing/under/rank/engineering/chief_engineer,
/obj/item/clothing/under/rank/centcom/officer, /obj/item/clothing/under/rank/centcom/commander,
/obj/item/melee/classic_baton/telescopic, /obj/item/card/id/silver, /obj/item/card/id/gold,
/obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),
@@ -131,7 +131,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard, /obj/item/clothing/suit/space/hardsuit/wizard,
/obj/item/gun/magic/staff, /obj/item/gun/magic/wand,
/obj/item/nullrod, /obj/item/clothing/under/rank/chaplain)),
/obj/item/nullrod, /obj/item/clothing/under/rank/civilian/chaplain)),
"aliens" = typecacheof(list(/obj/item/clothing/mask/facehugger, /obj/item/organ/body_egg/alien_embryo,
/obj/structure/alien, /obj/item/toy/toy_xeno,
@@ -145,21 +145,21 @@ SUBSYSTEM_DEF(traumas)
"birds" = typecacheof(list(/obj/item/clothing/mask/gas/plaguedoctor, /obj/item/reagent_containers/food/snacks/cracker,
/obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken,
/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask,
/obj/item/clothing/under/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/owl, /obj/item/clothing/mask/gas/owl_mask,
/obj/item/clothing/under/costume/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
/obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)),
"anime" = typecacheof(list(/obj/item/clothing/under/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
"anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/twohanded/vibro_weapon,
/obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)),
"mimes" = typecacheof(list(/obj/item/pda/mime, /obj/item/clothing/under/rank/mime, /obj/item/clothing/mask/gas/mime,
"mimes" = typecacheof(list(/obj/item/pda/mime, /obj/item/clothing/under/rank/civilian/mime, /obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/frenchberet, /obj/item/clothing/suit/suspenders, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
/obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime,
/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime,
/obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
/obj/item/clothing/under/rank/civilian/mime/sexy, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)),
code/datums/components/crafting/recipes/recipes_clothing.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/datum/crafting_recipe/mummy/body
name = "Mummification Bandages (Body)"
result = /obj/item/clothing/under/mummy
result = /obj/item/clothing/under/costume/mummy
reqs = list(/obj/item/stack/sheet/cloth = 5)
/datum/crafting_recipe/lizardhat
code/datums/components/crafting/recipes/recipes_misc.dm
+6 -6
View File
@@ -278,7 +278,7 @@
result = /obj/item/banner/command/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/captainparade = 1)
/obj/item/clothing/under/rank/captain/parade = 1)
category = CAT_MISC
/datum/crafting_recipe/engineering_banner
@@ -286,7 +286,7 @@
result = /obj/item/banner/engineering/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/engineer = 1)
/obj/item/clothing/under/rank/engineering/engineer = 1)
category = CAT_MISC
/datum/crafting_recipe/cargo_banner
@@ -294,7 +294,7 @@
result = /obj/item/banner/cargo/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/cargotech = 1)
/obj/item/clothing/under/rank/cargo/tech = 1)
category = CAT_MISC
/datum/crafting_recipe/science_banner
@@ -302,7 +302,7 @@
result = /obj/item/banner/science/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/scientist = 1)
/obj/item/clothing/under/rank/rnd/scientist = 1)
category = CAT_MISC
/datum/crafting_recipe/medical_banner
@@ -310,7 +310,7 @@
result = /obj/item/banner/medical/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/medical = 1)
/obj/item/clothing/under/rank/medical/doctor = 1)
category = CAT_MISC
/datum/crafting_recipe/security_banner
@@ -318,7 +318,7 @@
result = /obj/item/banner/security/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/security = 1)
/obj/item/clothing/under/rank/security/officer = 1)
category = CAT_MISC
/datum/crafting_recipe/bloodsucker/vassalrack
code/datums/dna.dm
+4 -4
View File
@@ -412,13 +412,13 @@
switch(deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 4))
if(G_MALE)
gender = MALE
set_gender(MALE, TRUE)
if(G_FEMALE)
gender = FEMALE
set_gender(FEMALE, TRUE)
if(G_PLURAL)
gender = PLURAL
set_gender(PLURAL, TRUE)
else
gender = NEUTER
set_gender(NEUTER, TRUE)
/mob/living/carbon/human/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0)
..()
code/datums/mutations.dm → code/datums/mutations/_mutations.dm
+23 -22
View File
@@ -51,45 +51,46 @@
if(copymut && istype(copymut, /datum/mutation/human))
copy_mutation(copymut)
/datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/owner)
if(!owner || !istype(owner) || owner.stat == DEAD || (src in owner.dna.mutations))
/datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/H)
if(!H || !istype(H) || H.stat == DEAD || (src in H.dna.mutations))
return TRUE
if(species_allowed.len && !species_allowed.Find(owner.dna.species.id))
if(species_allowed.len && !species_allowed.Find(H.dna.species.id))
return TRUE
if(health_req && owner.health < health_req)
if(health_req && H.health < health_req)
return TRUE
if(limb_req && !owner.get_bodypart(limb_req))
if(limb_req && !H.get_bodypart(limb_req))
return TRUE
dna = owner.dna
owner = H
dna = H.dna
dna.mutations += src
if(text_gain_indication)
to_chat(owner, text_gain_indication)
to_chat(H, text_gain_indication)
if(visual_indicators.len)
var/list/mut_overlay = list(get_visual_indicator(owner))
if(owner.overlays_standing[layer_used])
mut_overlay = owner.overlays_standing[layer_used]
mut_overlay |= get_visual_indicator(owner)
owner.remove_overlay(layer_used)
owner.overlays_standing[layer_used] = mut_overlay
owner.apply_overlay(layer_used)
var/list/mut_overlay = list(get_visual_indicator())
if(H.overlays_standing[layer_used])
mut_overlay = H.overlays_standing[layer_used]
mut_overlay |= get_visual_indicator()
H.remove_overlay(layer_used)
H.overlays_standing[layer_used] = mut_overlay
H.apply_overlay(layer_used)
grant_spell(owner)
grant_spell()
if(!modified)
addtimer(CALLBACK(src, .proc/modify, 5)) //gonna want children calling ..() to run first
/datum/mutation/human/proc/get_visual_indicator(mob/living/carbon/human/owner)
/datum/mutation/human/proc/get_visual_indicator()
return
/datum/mutation/human/proc/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
/datum/mutation/human/proc/on_attack_hand(atom/target, proximity)
return
/datum/mutation/human/proc/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
/datum/mutation/human/proc/on_ranged_attack(atom/target, mouseparams)
return
/datum/mutation/human/proc/on_move(mob/living/carbon/human/owner, new_loc)
/datum/mutation/human/proc/on_move(atom/new_loc)
return
/datum/mutation/human/proc/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/proc/on_life()
return
/datum/mutation/human/proc/on_losing(mob/living/carbon/human/owner)
@@ -172,7 +173,7 @@
else
qdel(src)
/datum/mutation/human/proc/grant_spell(mob/living/carbon/human/owner)
/datum/mutation/human/proc/grant_spell()
if(!ispath(power) || !owner)
return FALSE
@@ -180,4 +181,4 @@
power.action_background_icon_state = "bg_tech_blue_on"
power.panel = "Genetic"
owner.AddSpell(power)
return TRUE
return TRUE
code/datums/mutations/actions.dm
+1 -1
View File
@@ -111,7 +111,7 @@
energy_coeff = 1
synchronizer_coeff = 1
/datum/mutation/human/void/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/void/on_life()
if(!isturf(owner.loc))
return
if(prob((0.5+((100-dna.stability)/20))) * GET_MUTATION_SYNCHRONIZER(src)) //very rare, but enough to annoy you hopefully. +0.5 probability for every 10 points lost in stability
code/datums/mutations/antenna.dm
+2 -2
View File
@@ -36,7 +36,7 @@
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))//-MUTATIONS_LAYER+1
/datum/mutation/human/antenna/get_visual_indicator(mob/living/carbon/human/owner)
/datum/mutation/human/antenna/get_visual_indicator()
return visual_indicators[type][1]
/datum/mutation/human/mindreader
@@ -104,5 +104,5 @@
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))
/datum/mutation/human/mindreader/get_visual_indicator(mob/living/carbon/human/owner)
/datum/mutation/human/mindreader/get_visual_indicator()
return visual_indicators[type][1]
code/datums/mutations/body.dm
+5 -5
View File
@@ -9,7 +9,7 @@
synchronizer_coeff = 1
power_coeff = 1
/datum/mutation/human/epilepsy/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/epilepsy/on_life()
if(prob(1 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
owner.visible_message("<span class='danger'>[owner] starts having a seizure!</span>", "<span class='userdanger'>You have a seizure!</span>")
owner.Unconscious(200 * GET_MUTATION_POWER(src))
@@ -57,7 +57,7 @@
synchronizer_coeff = 1
power_coeff = 1
/datum/mutation/human/cough/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/cough/on_life()
if(prob(5 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
owner.drop_all_held_items()
owner.emote("cough")
@@ -118,7 +118,7 @@
text_gain_indication = "<span class='danger'>You twitch.</span>"
synchronizer_coeff = 1
/datum/mutation/human/tourettes/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/tourettes/on_life()
if(prob(10 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS && !owner.IsStun())
owner.Stun(200)
switch(rand(1, 3))
@@ -212,7 +212,7 @@
synchronizer_coeff = 1
power_coeff = 1
/datum/mutation/human/fire/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/fire/on_life()
if(prob((1+(100-dna.stability)/10)) * GET_MUTATION_SYNCHRONIZER(src))
owner.adjust_fire_stacks(2 * GET_MUTATION_POWER(src))
owner.IgniteMob()
@@ -268,7 +268,7 @@
text_gain_indication = "<span class='danger'>You feel screams echo through your mind...</span>"
text_lose_indication = "<span class'notice'>The screaming in your mind fades.</span>"
/datum/mutation/human/paranoia/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/paranoia/on_life()
if(prob(5) && owner.stat == CONSCIOUS)
owner.emote("scream")
owner.jitteriness = min(max(0, owner.jitteriness + 5), 30)
code/datums/mutations/chameleon.dm
+3 -3
View File
@@ -14,13 +14,13 @@
return
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
/datum/mutation/human/chameleon/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/chameleon/on_life()
owner.alpha = max(0, owner.alpha - 25)
/datum/mutation/human/chameleon/on_move(mob/living/carbon/human/owner)
/datum/mutation/human/chameleon/on_move(atom/new_loc)
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
/datum/mutation/human/chameleon/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
/datum/mutation/human/chameleon/on_attack_hand(atom/target, proximity)
if(proximity) //stops tk from breaking chameleon
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
return
code/datums/mutations/hulk.dm
+2 -2
View File
@@ -19,11 +19,11 @@
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
/datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner,atom/target, proximity)
/datum/mutation/human/hulk/on_attack_hand(atom/target, proximity)
if(proximity) //no telekinetic hulk attack
return target.attack_hulk(owner)
/datum/mutation/human/hulk/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/hulk/on_life()
if(owner.health < 0)
on_losing(owner)
to_chat(owner, "<span class='danger'>You suddenly feel very weak.</span>")
code/datums/mutations/radioactive.dm
+1 -1
View File
@@ -7,7 +7,7 @@
instability = 5
difficulty = 8
/datum/mutation/human/radioactive/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/radioactive/on_life()
radiation_pulse(owner, 20)
/datum/mutation/human/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
code/datums/mutations/space_adaptation.dm
+1 -1
View File
@@ -13,7 +13,7 @@
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
/datum/mutation/human/space_adaptation/get_visual_indicator(mob/living/carbon/human/owner)
/datum/mutation/human/space_adaptation/get_visual_indicator()
return visual_indicators[type][1]
/datum/mutation/human/space_adaptation/on_acquiring(mob/living/carbon/human/owner)
code/datums/mutations/speech.dm
+1 -1
View File
@@ -7,7 +7,7 @@
quality = MINOR_NEGATIVE
text_gain_indication = "<span class='danger'>You feel nervous.</span>"
/datum/mutation/human/nervousness/on_life(mob/living/carbon/human/owner)
/datum/mutation/human/nervousness/on_life()
if(prob(10))
owner.stuttering = max(10, owner.stuttering)
code/datums/mutations/telekinesis.dm
+3 -3
View File
@@ -13,8 +13,8 @@
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER))
/datum/mutation/human/telekinesis/get_visual_indicator(mob/living/carbon/human/owner)
/datum/mutation/human/telekinesis/get_visual_indicator()
return visual_indicators[type][1]
/datum/mutation/human/telekinesis/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
target.attack_tk(owner)
/datum/mutation/human/telekinesis/on_ranged_attack(atom/target, mouseparams)
target.attack_tk(owner)
code/datums/ruins/lavaland.dm
+1 -11
View File
@@ -248,14 +248,4 @@
cost = 5
placement_weight = 3
always_place = TRUE
allow_duplicates = TRUE
// Mining Base
/datum/map_template/ruin/lavaland/mining_base //THIS IS THE MINING BASE. DO NOT FUCK WITH THIS UNLESS YOU ARE 100% CERTAIN YOU KNOW WHAT YOU'RE DOING, OR THE MINING BASE WILL DISAPPEAR
name = "Mining Base"
id = "miningbase"
description = "The mining base that Nanotrasen uses for their mining operations."
suffix = "miningbase.dmm"
cost = 0
always_place = TRUE
unpickable = TRUE
allow_duplicates = TRUE
code/datums/ruins/station.dm
+7
View File
@@ -54,3 +54,10 @@
id = "engine_budget"
suffix = "Box/Engine/budget.dmm"
name = "Box P.A.C.M.A.N"
// Lavaland
// Mining Base
/datum/map_template/ruin/station/lavaland/mining_base
id = "mining_public_01"
suffix = "Lavaland/Mining_Station/Mining_Station_Public_01.dmm"
name = "Public Mining Base"
code/datums/status_effects/buffs.dm
+13 -6
View File
@@ -48,20 +48,24 @@
status_type = STATUS_EFFECT_REPLACE
alert_type = /obj/screen/alert/status_effect/vanguard
var/datum/progressbar/progbar
var/stamhealed = 0 //How much stamina did we regenerate?
/obj/screen/alert/status_effect/vanguard
name = "Vanguard"
desc = "You're absorbing stuns! Your stamina is greatly increased, but not infinite. 25% of all stuns taken will affect you after this effect ends."
desc = "You're absorbing stuns aswell as quickly regenerating stamina, but be careful: 50% of stamina restored and 25% of stuns absorbed will affect you after this effect ends."
icon_state = "vanguard"
alerttooltipstyle = "clockcult"
/obj/screen/alert/status_effect/vanguard/MouseEntered(location,control,params)
var/mob/living/L = usr
var/datum/status_effect/vanguard_shield/E = attached_effect
if(istype(L)) //this is probably more safety than actually needed
var/vanguard = L.stun_absorption["vanguard"]
desc = initial(desc)
desc += "<br><b>[FLOOR(vanguard["stuns_absorbed"] * 0.1, 1)]</b> seconds of stuns held back.\
[GLOB.ratvar_awakens ? "":"<br><b>[FLOOR(min(vanguard["stuns_absorbed"] * 0.025, 20), 1)]</b> seconds of stun will affect you."]"
<br><b>[E.stamhealed]</b> stamina regenerated.\
[GLOB.ratvar_awakens ? "":"<br><b>[FLOOR(min(vanguard["stuns_absorbed"] * 0.025, 20), 1)]</b> seconds of stun will affect you.\
<br>You will incur <b>[E.stamhealed * 0.5]</b> staminaloss."]"
..()
/datum/status_effect/vanguard_shield/Destroy()
@@ -72,9 +76,8 @@
/datum/status_effect/vanguard_shield/on_apply()
owner.log_message("gained Vanguard stun immunity", LOG_ATTACK)
owner.add_stun_absorption("vanguard", INFINITY, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!")
owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns for the next twenty seconds.</span>")
owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns aswell as quickly regenerate stamina for the next twenty seconds .</span>")
owner.SetAllImmobility(0, FALSE)
owner.setStaminaLoss(0, FALSE)
progbar = new(owner, duration, owner)
progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0))
progbar.update(duration - world.time)
@@ -82,6 +85,9 @@
/datum/status_effect/vanguard_shield/tick()
progbar.update(duration - world.time)
var/oldstamloss = owner.getStaminaLoss()
owner.adjustStaminaLoss(-6) //up to 30 stam / second for now, lets see...
stamhealed += oldstamloss - owner.getStaminaLoss()
/datum/status_effect/vanguard_shield/on_remove()
. = ..()
@@ -96,8 +102,9 @@
for(var/i in owner.stun_absorption)
if(owner.stun_absorption[i]["end_time"] > world.time && owner.stun_absorption[i]["priority"] > vanguard["priority"])
otheractiveabsorptions = TRUE
if(!GLOB.ratvar_awakens && stuns_blocked && !otheractiveabsorptions)
if(!GLOB.ratvar_awakens && (stuns_blocked && !otheractiveabsorptions || stamhealed))
owner.DefaultCombatKnockdown(stuns_blocked)
owner.adjustStaminaLoss(stamhealed * 0.5)
message_to_owner = "<span class='boldwarning'>The weight of the Vanguard's protection crashes down upon you!</span>"
if(stuns_blocked >= 300)
message_to_owner += "\n<span class='userdanger'>You faint from the exertion!</span>"
@@ -106,7 +113,7 @@
else
stuns_blocked = 0 //so logging is correct in cases where there were stuns blocked but we didn't stun for other reasons
owner.visible_message("<span class='warning'>[owner]'s glowing aura fades!</span>", message_to_owner)
owner.log_message("lost Vanguard stun immunity[stuns_blocked ? "and was stunned for [stuns_blocked]":""]", LOG_ATTACK)
owner.log_message("lost Vanguard stun immunity[stuns_blocked ? "and was stunned for [stuns_blocked]":""] [stamhealed ? ", incurring [stamhealed * 0.25] staminaloss" : ""]", LOG_ATTACK)
/datum/status_effect/inathneqs_endowment
id = "inathneqs_endowment"
code/game/gamemodes/clock_cult/clock_cult.dm
+1 -1
View File
@@ -269,7 +269,7 @@ Credit where due:
//Servant of Ratvar outfit
/datum/outfit/servant_of_ratvar
name = "Servant of Ratvar"
uniform = /obj/item/clothing/under/rank/engineer //no more chameleon suit for them, as requested
uniform = /obj/item/clothing/under/rank/engineering/engineer //no more chameleon suit for them, as requested
shoes = /obj/item/clothing/shoes/sneakers/black
back = /obj/item/storage/backpack
ears = /obj/item/radio/headset
code/game/gamemodes/clown_ops/bananium_bomb.dm
+1 -1
View File
@@ -35,7 +35,7 @@
H.Stun(10)
var/obj/item/clothing/C
if(!H.w_uniform || H.dropItemToGround(H.w_uniform))
C = new /obj/item/clothing/under/rank/clown(H)
C = new /obj/item/clothing/under/rank/civilian/clown(H)
ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
H.equip_to_slot_or_del(C, SLOT_W_UNIFORM)
code/game/gamemodes/gangs/gang_datums.dm
+6 -6
View File
@@ -21,7 +21,7 @@
/datum/team/gang/zerog
name = "Zero-G"
color = "#C0C0C0"
inner_outfits = list(/obj/item/clothing/under/suit_jacket/white)
inner_outfits = list(/obj/item/clothing/under/suit/white)
outer_outfits = list(/obj/item/clothing/suit/hooded/wintercoat)
/datum/team/gang/max
@@ -33,13 +33,13 @@
/datum/team/gang/blasto
name = "Blasto"
color = "#000080"
inner_outfits = list(/obj/item/clothing/under/suit_jacket/navy)
inner_outfits = list(/obj/item/clothing/under/suit/navy)
outer_outfits = list(/obj/item/clothing/suit/jacket/miljacket)
/datum/team/gang/waffle
name = "Waffle"
color = "#808000" //shared color with cyber, but they can keep brown cause waffles.
inner_outfits = list(/obj/item/clothing/under/suit_jacket/green)
inner_outfits = list(/obj/item/clothing/under/suit/green)
outer_outfits = list(/obj/item/clothing/suit/poncho)
/datum/team/gang/north
@@ -87,7 +87,7 @@
/datum/team/gang/tunnel
name = "Tunnel"
color = "#FF00FF" //Gave the leather jacket to the tunnel gang over diablo.
inner_outfits = list(/obj/item/clothing/under/villain)
inner_outfits = list(/obj/item/clothing/under/costume/villain)
outer_outfits = list(/obj/item/clothing/suit/jacket/leather)
/datum/team/gang/diablo
@@ -123,13 +123,13 @@
/datum/team/gang/h
name = "H"
color = "#993333"
inner_outfits = list(/obj/item/clothing/under/jabroni) //Why not?
inner_outfits = list(/obj/item/clothing/under/costume/jabroni) //Why not?
outer_outfits = list(/obj/item/clothing/suit/toggle/owlwings)
/datum/team/gang/rigatonifamily
name = "Rigatoni family"
color = "#cc9900" // p a s t a colored
inner_outfits = list(/obj/item/clothing/under/rank/chef)
inner_outfits = list(/obj/item/clothing/under/rank/civilian/chef)
outer_outfits = list(/obj/item/clothing/suit/apron/chef)
/datum/team/gang/weed
code/game/objects/effects/landmarks.dm
+5
View File
@@ -506,3 +506,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/stationroom/box/engine/New()
. = ..()
templates = CONFIG_GET(keyed_list/box_random_engine)
// Landmark for the mining station
/obj/effect/landmark/stationroom/lavaland/station
templates = list("Public Mining Base" = 3)
icon = 'icons/rooms/Lavaland/Mining.dmi'
code/game/objects/effects/spawners/bundle.dm
+16 -16
View File
@@ -24,20 +24,20 @@
/obj/effect/spawner/bundle/costume/gladiator
name = "gladiator costume spawner"
items = list(
/obj/item/clothing/under/gladiator,
/obj/item/clothing/under/costume/gladiator,
/obj/item/clothing/head/helmet/gladiator)
/obj/effect/spawner/bundle/costume/madscientist
name = "mad scientist costume spawner"
items = list(
/obj/item/clothing/under/gimmick/rank/captain/suit,
/obj/item/clothing/under/rank/captain/suit,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/suit/toggle/labcoat/mad)
/obj/effect/spawner/bundle/costume/elpresidente
name = "el presidente costume spawner"
items = list(
/obj/item/clothing/under/gimmick/rank/captain/suit,
/obj/item/clothing/under/rank/captain/suit,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/mask/cigarette/cigar/havana,
/obj/item/clothing/shoes/jackboots)
@@ -45,14 +45,14 @@
/obj/effect/spawner/bundle/costume/nyangirl
name = "nyangirl costume spawner"
items = list(
/obj/item/clothing/under/schoolgirl,
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/clothing/head/kitty,
/obj/item/clothing/glasses/sunglasses/blindfold)
/obj/effect/spawner/bundle/costume/maid
name = "maid costume spawner"
items = list(
/obj/item/clothing/under/skirt/black,
/obj/item/clothing/under/dress/skirt,
/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
/obj/item/clothing/glasses/sunglasses/blindfold)
@@ -61,13 +61,13 @@
name = "butler costume spawner"
items = list(
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/under/suit_jacket,
/obj/item/clothing/under/suit/black,
/obj/item/clothing/head/that)
/obj/effect/spawner/bundle/costume/highlander
name = "highlander costume spawner"
items = list(
/obj/item/clothing/under/kilt,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/head/beret)
/obj/effect/spawner/bundle/costume/prig
@@ -78,7 +78,7 @@
/obj/effect/spawner/lootdrop/minor/bowler_or_that,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/cane,
/obj/item/clothing/under/sl_suit,
/obj/item/clothing/under/suit/sl,
/obj/item/clothing/mask/fakemoustache)
/obj/effect/spawner/bundle/costume/plaguedoctor
@@ -92,7 +92,7 @@
name = "night owl costume spawner"
items = list(
/obj/item/clothing/suit/toggle/owlwings,
/obj/item/clothing/under/owl,
/obj/item/clothing/under/costume/owl,
/obj/item/clothing/mask/gas/owl_mask)
/obj/effect/spawner/bundle/costume/griffin
@@ -100,20 +100,20 @@
items = list(
/obj/item/clothing/suit/toggle/owlwings/griffinwings,
/obj/item/clothing/shoes/griffin,
/obj/item/clothing/under/griffin,
/obj/item/clothing/under/costume/griffin,
/obj/item/clothing/head/griffin)
/obj/effect/spawner/bundle/costume/waiter
name = "waiter costume spawner"
items = list(
/obj/item/clothing/under/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
/obj/item/clothing/suit/apron)
/obj/effect/spawner/bundle/costume/pirate
name = "pirate costume spawner"
items = list(
/obj/item/clothing/under/pirate,
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/suit/pirate,
/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/obj/item/clothing/glasses/eyepatch)
@@ -121,7 +121,7 @@
/obj/effect/spawner/bundle/costume/commie
name = "commie costume spawner"
items = list(
/obj/item/clothing/under/soviet,
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/head/ushanka)
/obj/effect/spawner/bundle/costume/imperium_monk
@@ -145,7 +145,7 @@
/obj/effect/spawner/bundle/costume/cutewitch
name = "cute witch costume spawner"
items = list(
/obj/item/clothing/under/sundress,
/obj/item/clothing/under/dress/sundress,
/obj/item/clothing/head/witchwig,
/obj/item/staff/broom)
@@ -161,10 +161,10 @@
name = "sexy clown costume spawner"
items = list(
/obj/item/clothing/mask/gas/sexyclown,
/obj/item/clothing/under/rank/clown/sexy)
/obj/item/clothing/under/rank/civilian/clown/sexy)
/obj/effect/spawner/bundle/costume/sexymime
name = "sexy mime costume spawner"
items = list(
/obj/item/clothing/mask/gas/sexymime,
/obj/item/clothing/under/sexymime)
/obj/item/clothing/under/rank/civilian/mime/sexy)
code/game/objects/items/miscellaneous.dm
+2 -2
View File
@@ -79,7 +79,7 @@
/obj/item/storage/box/hero/PopulateContents()
new /obj/item/clothing/head/fedora/curator(src)
new /obj/item/clothing/suit/curator(src)
new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src)
new /obj/item/clothing/shoes/workboots/mining(src)
new /obj/item/melee/curator_whip(src)
@@ -96,7 +96,7 @@
name = "Braveheart, the Scottish rebel - 1300's."
/obj/item/storage/box/hero/scottish/PopulateContents()
new /obj/item/clothing/under/kilt(src)
new /obj/item/clothing/under/costume/kilt(src)
new /obj/item/claymore/weak/ceremonial(src)
new /obj/item/toy/crayon/spraycan(src)
new /obj/item/clothing/shoes/sandal(src)
code/game/objects/items/stacks/sheets/leather.dm
+1 -1
View File
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(human_recipes, list( \
GLOBAL_LIST_INIT(gondola_recipes, list ( \
new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1), \
new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/gondola, 2), \
new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2), \
new/datum/stack_recipe("gondola bedsheet", /obj/item/bedsheet/gondola, 1), \
))
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
* Durathread
*/
GLOBAL_LIST_INIT(durathread_recipes, list ( \
new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/durathread, 4, time = 40),
new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 40),
new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \
new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \
code/game/objects/items/storage/backpack.dm
+2 -2
View File
@@ -458,7 +458,7 @@
item_state = "duffel-syndieammo"
/obj/item/storage/backpack/duffelbag/syndie/hitman/PopulateContents()
new /obj/item/clothing/under/lawyer/blacksuit(src)
new /obj/item/clothing/under/suit/black(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/suit/toggle/lawyer/black(src)
new /obj/item/clothing/shoes/laceup(src)
@@ -630,7 +630,7 @@
/obj/item/storage/backpack/duffelbag/clown/syndie/PopulateContents()
new /obj/item/pda/clown(src)
new /obj/item/clothing/under/rank/clown(src)
new /obj/item/clothing/under/rank/civilian/clown(src)
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/bikehorn(src)
code/game/objects/items/storage/briefcase.dm
+1 -1
View File
@@ -99,7 +99,7 @@
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/ammo_box/magazine/m10mm/soporific(src)
new /obj/item/ammo_box/c10mm/soporific(src)
new /obj/item/clothing/under/lawyer/blacksuit(src)
new /obj/item/clothing/under/suit/black(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/suit/toggle/lawyer/black/syndie(src)
code/game/objects/items/storage/toolbox.dm
+2 -1
View File
@@ -177,7 +177,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
STR.max_items = 28
/obj/item/storage/toolbox/brass/prefilled/PopulateContents()
new fabricator_type(src)
if(fabricator_type)
new fabricator_type(src)
new /obj/item/screwdriver/brass(src)
new /obj/item/wirecutters/brass(src)
new /obj/item/wrench/brass(src)
code/game/objects/items/storage/uplink_kits.dm
+5 -6
View File
@@ -49,7 +49,7 @@
new /obj/item/grenade/plastic/c4(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/clothing/under/suit_jacket/really_black(src)
new /obj/item/clothing/under/suit/black_really(src)
new /obj/item/screwdriver/power(src) //2 tc item
if("murder") // 35 tc
@@ -130,7 +130,7 @@
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/clothing/under/suit_jacket/really_black(src)
new /obj/item/clothing/under/suit/black_really(src)
if("metaops") // 30 tc
new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
@@ -343,7 +343,7 @@
new /obj/item/implanter/radio/syndicate(src)
/obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents()
new /obj/item/clothing/under/rank/centcom_officer/syndicate(src)
new /obj/item/clothing/under/rank/centcom/officer/syndicate(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/radio/headset/headset_cent/empty(src)
@@ -481,13 +481,12 @@
/obj/item/storage/backpack/duffelbag/syndie/surgery,
/obj/item/encryptionkey/syndicate,
/obj/item/clothing/glasses/thermal/syndi,
/obj/item/slimepotion/slime/sentience/nuclear,
/obj/item/storage/box/syndie_kit/imp_radio,
/obj/item/storage/box/syndie_kit/imp_uplink,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
/obj/item/reagent_containers/syringe/stimulants,
/obj/item/storage/box/syndie_kit/imp_freedom
/obj/item/storage/box/syndie_kit/imp_freedom,
/obj/item/storage/toolbox/infiltrator
)
var/obj/item1 = pick_n_take(item_list)
var/obj/item2 = pick_n_take(item_list)
code/game/objects/structures/crates_lockers/closets/fitness.dm
+4 -4
View File
@@ -11,10 +11,10 @@
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/green(src)
new /obj/item/clothing/under/jabroni(src)
new /obj/item/clothing/under/polychromic/shortpants(src)
new /obj/item/clothing/under/polychromic/shortpants(src)
new /obj/item/clothing/under/polychromic/shortpants(src)
new /obj/item/clothing/under/costume/jabroni(src)
new /obj/item/clothing/under/shorts/polychromic(src)
new /obj/item/clothing/under/shorts/polychromic(src)
new /obj/item/clothing/under/shorts/polychromic(src)
/obj/structure/closet/boxinggloves
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+1 -1
View File
@@ -27,7 +27,7 @@
for(var/i in 1 to 5)
new /obj/item/clothing/head/ushanka(src)
for(var/i in 1 to 5)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/costume/soviet(src)
/obj/structure/closet/gimmick/tacticool
name = "tacticool gear closet"
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+36 -36
View File
@@ -11,10 +11,10 @@
new /obj/item/radio/headset/headset_srv(src)
new /obj/item/radio/headset/headset_srv(src)
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/suit/sl(src)
new /obj/item/clothing/under/suit/sl(src)
new /obj/item/clothing/under/rank/civilian/bartender(src)
new /obj/item/clothing/under/rank/civilian/bartender(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/head/soft/black(src)
@@ -37,8 +37,8 @@
/obj/structure/closet/chefcloset/PopulateContents()
..()
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/suit/waiter(src)
new /obj/item/clothing/under/suit/waiter(src)
new /obj/item/radio/headset/headset_srv(src)
new /obj/item/radio/headset/headset_srv(src)
new /obj/item/clothing/accessory/waistcoat(src)
@@ -51,7 +51,7 @@
new /obj/item/storage/box/mousetraps(src)
new /obj/item/circuitboard/machine/dish_drive(src)
new /obj/item/clothing/suit/toggle/chef(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/under/rank/civilian/chef(src)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/reagent_containers/rag(src)
@@ -62,7 +62,7 @@
/obj/structure/closet/jcloset/PopulateContents()
..()
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/clothing/under/rank/civilian/janitor(src)
new /obj/item/cartridge/janitor(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/head/soft/purple(src)
@@ -87,14 +87,14 @@
/obj/structure/closet/lawcloset/PopulateContents()
..()
new /obj/item/clothing/under/lawyer/female(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/lawyer/bluesuit(src)
new /obj/item/clothing/under/rank/civilian/lawyer/female(src)
new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
new /obj/item/clothing/under/rank/civilian/lawyer/red(src)
new /obj/item/clothing/under/rank/civilian/lawyer/bluesuit(src)
new /obj/item/clothing/suit/toggle/lawyer(src)
new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/under/rank/civilian/lawyer/purpsuit(src)
new /obj/item/clothing/suit/toggle/lawyer/purple(src)
new /obj/item/clothing/under/lawyer/blacksuit(src)
new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
new /obj/item/clothing/suit/toggle/lawyer/black(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/shoes/laceup(src)
@@ -109,7 +109,7 @@
/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
new /obj/item/choice_beacon/holy(src)
new /obj/item/clothing/accessory/pocketprotector/cosmetology(src)
new /obj/item/clothing/under/rank/chaplain(src)
new /obj/item/clothing/under/rank/civilian/chaplain(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/suit/chaplain/nun(src)
new /obj/item/clothing/head/nun_hood(src)
@@ -130,9 +130,9 @@
new /obj/item/storage/backpack/duffelbag/sec(src)
new /obj/item/storage/backpack/duffelbag/sec(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security/officer(src)
for(var/i in 1 to 2)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/under/rank/security/officer/skirt(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/jackboots(src)
for(var/i in 1 to 3)
@@ -151,7 +151,7 @@
/obj/structure/closet/wardrobe/cargotech/PopulateContents()
new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/rank/cargotech(src)
new /obj/item/clothing/under/rank/cargo/tech(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
for(var/i in 1 to 3)
@@ -172,7 +172,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/engineering/atmospheric_technician(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
return
@@ -188,7 +188,7 @@
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineering/engineer(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/hazardvest(src)
for(var/i in 1 to 3)
@@ -206,13 +206,13 @@
new /obj/item/storage/backpack/medic(src)
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/clothing/suit/hooded/wintercoat/medical(src)
new /obj/item/clothing/under/rank/nursesuit(src)
new /obj/item/clothing/under/rank/medical/doctor/nurse(src)
new /obj/item/clothing/head/nursehat(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/under/rank/medical/doctor/blue(src)
new /obj/item/clothing/under/rank/medical/doctor/green(src)
new /obj/item/clothing/under/rank/medical/doctor/purple(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical/doctor(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/toggle/labcoat(src)
for(var/i in 1 to 3)
@@ -230,8 +230,8 @@
/obj/structure/closet/wardrobe/robotics_black/PopulateContents()
new /obj/item/clothing/glasses/hud/diagnostic(src)
new /obj/item/clothing/glasses/hud/diagnostic(src)
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/under/rank/rnd/roboticist(src)
new /obj/item/clothing/under/rank/rnd/roboticist(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
new /obj/item/clothing/shoes/sneakers/black(src)
@@ -252,8 +252,8 @@
icon_door = "white"
/obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/rank/medical/chemist(src)
new /obj/item/clothing/under/rank/medical/chemist(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
@@ -272,8 +272,8 @@
icon_door = "white"
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/rank/medical/geneticist(src)
new /obj/item/clothing/under/rank/medical/geneticist(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
@@ -290,8 +290,8 @@
icon_door = "white"
/obj/structure/closet/wardrobe/virology_white/PopulateContents()
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/rank/medical/virologist(src)
new /obj/item/clothing/under/rank/medical/virologist(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
@@ -316,7 +316,7 @@
new /obj/item/storage/backpack/satchel/tox(src)
new /obj/item/clothing/suit/hooded/wintercoat/science(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/rnd/scientist(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/toggle/labcoat/science(src)
for(var/i in 1 to 3)
@@ -342,7 +342,7 @@
new /obj/item/clothing/suit/apron/overalls(src)
new /obj/item/clothing/suit/apron/overalls(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/clothing/under/rank/civilian/hydroponics(src)
for(var/i in 1 to 3)
new /obj/item/clothing/mask/bandana(src)
@@ -355,7 +355,7 @@
new /obj/item/clothing/accessory/pocketprotector/full(src)
new /obj/item/clothing/head/fedora/curator(src)
new /obj/item/clothing/suit/curator(src)
new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src)
new /obj/item/clothing/shoes/workboots/mining(src)
new /obj/item/storage/backpack/satchel/explorer(src)
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+2 -2
View File
@@ -8,8 +8,8 @@
new /obj/item/clothing/neck/cloak/qm(src)
new /obj/item/clothing/head/beret/qm(src)
new /obj/item/storage/lockbox/medal/cargo(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/under/rank/cargo/skirt(src)
new /obj/item/clothing/under/rank/cargo/qm(src)
new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/radio/headset/heads/qm(src)
new /obj/item/clothing/suit/fire/firefighter(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -2
View File
@@ -7,8 +7,8 @@
..()
new /obj/item/clothing/neck/cloak/ce(src)
new /obj/item/clothing/head/beret/ce(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/hardhat/weldhat/white(src)
new /obj/item/clothing/gloves/color/yellow(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+3 -2
View File
@@ -60,8 +60,9 @@
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck(src)
new /obj/item/clothing/shoes/sneakers/brown (src)
new /obj/item/cartridge/cmo(src)
new /obj/item/radio/headset/heads/cmo(src)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+6 -6
View File
@@ -10,12 +10,12 @@
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
new /obj/item/clothing/under/rank/research_director(src)
new /obj/item/clothing/under/rank/research_director/skirt(src)
new /obj/item/clothing/under/rank/research_director/alt(src)
new /obj/item/clothing/under/rank/research_director/alt/skirt(src)
new /obj/item/clothing/under/rank/research_director/turtleneck(src)
new /obj/item/clothing/under/rank/research_director/turtleneck/skirt(src)
new /obj/item/clothing/under/rank/rnd/research_director(src)
new /obj/item/clothing/under/rank/rnd/research_director/skirt(src)
new /obj/item/clothing/under/rank/rnd/research_director/alt(src)
new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src)
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src)
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/cartridge/rd(src)
new /obj/item/clothing/gloves/color/latex(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+16 -16
View File
@@ -25,8 +25,8 @@
/obj/structure/closet/secure_closet/hop/PopulateContents()
..()
new /obj/item/clothing/neck/cloak/hop(src)
new /obj/item/clothing/under/rank/head_of_personnel(src)
new /obj/item/clothing/under/rank/head_of_personnel/skirt(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt(src)
new /obj/item/clothing/head/hopcap(src)
new /obj/item/clothing/head/hopcap/beret(src)
new /obj/item/cartridge/hop(src)
@@ -57,17 +57,17 @@
new /obj/item/clothing/neck/cloak/hos(src)
new /obj/item/cartridge/hos(src)
new /obj/item/radio/headset/heads/hos(src)
new /obj/item/clothing/under/hosparadefem(src)
new /obj/item/clothing/under/hosparademale(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade(src)
new /obj/item/clothing/suit/armor/vest/leather(src)
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/under/rank/head_of_security/skirt(src)
new /obj/item/clothing/under/rank/head_of_security/alt(src)
new /obj/item/clothing/under/rank/head_of_security/alt/skirt(src)
new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
new /obj/item/clothing/head/HoS(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
new /obj/item/clothing/under/rank/head_of_security/grey(src)
new /obj/item/clothing/under/rank/security/head_of_security/grey(src)
new /obj/item/storage/lockbox/medal/sec(src)
new /obj/item/megaphone/sec(src)
new /obj/item/holosign_creator/security(src)
@@ -94,8 +94,8 @@
new /obj/item/clothing/head/warden/drill(src)
new /obj/item/clothing/head/beret/sec/navywarden(src)
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
new /obj/item/clothing/under/rank/warden/navyblue(src)
new /obj/item/clothing/under/rank/warden/skirt(src)
new /obj/item/clothing/under/rank/security/warden/formal(src)
new /obj/item/clothing/under/rank/security/warden/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/mask/gas/sechailer(src)
@@ -155,13 +155,13 @@
/obj/structure/closet/secure_closet/detective/PopulateContents()
..()
new /obj/item/clothing/under/rank/det(src)
new /obj/item/clothing/under/rank/det/skirt(src)
new /obj/item/clothing/under/rank/security/detective(src)
new /obj/item/clothing/under/rank/security/detective/skirt(src)
new /obj/item/clothing/suit/det_suit(src)
new /obj/item/clothing/head/fedora/det_hat(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/under/rank/det/grey(src)
new /obj/item/clothing/under/rank/det/grey/skirt(src)
new /obj/item/clothing/under/rank/security/detective/grey(src)
new /obj/item/clothing/under/rank/security/detective/grey/skirt(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/suit/det_suit/grey(src)
new /obj/item/clothing/head/fedora(src)
@@ -286,7 +286,7 @@
..()
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/sec(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/under/rank/security/officer/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/flashlight/seclite(src)
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+1 -1
View File
@@ -170,7 +170,7 @@
if(prob(90))
new /obj/item/wirecutters(src)
new /obj/item/clothing/suit/bomb_suit/security(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/head/bomb_hood/security(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+28 -28
View File
@@ -7,7 +7,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/under/color/blue(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/skirt/color/blue(src)
new /obj/item/clothing/under/color/jumpskirt/blue(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/brown(src)
return
@@ -18,7 +18,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/under/color/pink(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/skirt/color/pink(src)
new /obj/item/clothing/under/color/jumpskirt/pink(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/brown(src)
return
@@ -29,7 +29,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/under/color/black(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/skirt/color/black(src)
new /obj/item/clothing/under/color/jumpskirt/black(src)
if(prob(25))
new /obj/item/clothing/suit/jacket/leather(src)
if(prob(20))
@@ -52,7 +52,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/under/color/green(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/skirt/color/green(src)
new /obj/item/clothing/under/color/jumpskirt/green(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/mask/bandana/green(src)
@@ -77,7 +77,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/under/color/yellow(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/skirt/color/yellow(src)
new /obj/item/clothing/under/color/jumpskirt/yellow(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/orange(src)
new /obj/item/clothing/mask/bandana/gold(src)
@@ -90,7 +90,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/under/color/white(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/skirt/color/white(src)
new /obj/item/clothing/under/color/jumpskirt/white(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/white(src)
for(var/i in 1 to 3)
@@ -100,10 +100,10 @@
name = "pajama wardrobe"
icon_door = "white"
/obj/structure/closet/wardrobe/pjs/PopulateContents()
new /obj/item/clothing/under/pj/red(src)
new /obj/item/clothing/under/pj/red(src)
new /obj/item/clothing/under/pj/blue(src)
new /obj/item/clothing/under/pj/blue(src)
new /obj/item/clothing/under/misc/pj/red(src)
new /obj/item/clothing/under/misc/pj/red(src)
new /obj/item/clothing/under/misc/pj/blue(src)
new /obj/item/clothing/under/misc/pj/blue(src)
for(var/i in 1 to 4)
new /obj/item/clothing/shoes/sneakers/white(src)
return
@@ -114,7 +114,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/under/color/grey(src)
for(var/i in 1 to 3)
new /obj/item/clothing/under/skirt/color/grey(src)
new /obj/item/clothing/under/color/jumpskirt/grey(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
for(var/i in 1 to 3)
@@ -125,10 +125,10 @@
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/black(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
new /obj/item/clothing/under/misc/assistantformal(src)
new /obj/item/clothing/suit/hooded/wintercoat/aformal(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
new /obj/item/clothing/under/misc/assistantformal(src)
new /obj/item/clothing/suit/hooded/wintercoat/aformal(src)
if(prob(30))
new /obj/item/clothing/suit/hooded/wintercoat(src)
@@ -144,21 +144,21 @@
new /obj/item/clothing/suit/jacket(src)
if(prob(40))
new /obj/item/clothing/suit/jacket(src)
new /obj/item/clothing/under/polychromic/jumpsuit(src)
new /obj/item/clothing/under/polychromic/jumpsuit(src)
new /obj/item/clothing/under/polychromic/jumpsuit(src)
new /obj/item/clothing/under/polychromic/shirt(src)
new /obj/item/clothing/under/polychromic/shirt(src)
new /obj/item/clothing/under/polychromic/shirt(src)
new /obj/item/clothing/under/polychromic/kilt(src)
new /obj/item/clothing/under/polychromic/kilt(src)
new /obj/item/clothing/under/polychromic/kilt(src)
new /obj/item/clothing/under/polychromic/skirt(src)
new /obj/item/clothing/under/polychromic/skirt(src)
new /obj/item/clothing/under/polychromic/skirt(src)
new /obj/item/clothing/under/polychromic/shorts(src)
new /obj/item/clothing/under/polychromic/shorts(src)
new /obj/item/clothing/under/polychromic/shorts(src)
new /obj/item/clothing/under/misc/polyjumpsuit(src)
new /obj/item/clothing/under/misc/polyjumpsuit(src)
new /obj/item/clothing/under/misc/polyjumpsuit(src)
new /obj/item/clothing/under/misc/poly_shirt(src)
new /obj/item/clothing/under/misc/poly_shirt(src)
new /obj/item/clothing/under/misc/poly_shirt(src)
new /obj/item/clothing/under/costume/kilt/polychromic(src)
new /obj/item/clothing/under/costume/kilt/polychromic(src)
new /obj/item/clothing/under/costume/kilt/polychromic(src)
new /obj/item/clothing/under/dress/skirt/polychromic(src)
new /obj/item/clothing/under/dress/skirt/polychromic(src)
new /obj/item/clothing/under/dress/skirt/polychromic(src)
new /obj/item/clothing/under/misc/polyshorts(src)
new /obj/item/clothing/under/misc/polyshorts(src)
new /obj/item/clothing/under/misc/polyshorts(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/blue(src)
code/game/objects/structures/ghost_role_spawners.dm
+11 -11
View File
@@ -89,7 +89,7 @@
/datum/outfit/ashwalker
name ="Ashwalker"
head = /obj/item/clothing/head/helmet/gladiator
uniform = /obj/item/clothing/under/gladiator/ash_walker
uniform = /obj/item/clothing/under/costume/gladiator/ash_walker
//Timeless prisons: Spawns in Wish Granter prisons in lavaland. Ghosts become age-old users of the Wish Granter and are advised to seek repentance for their past.
@@ -243,7 +243,7 @@
flavour_text += "you were a [pick("arms dealer", "shipwright", "docking manager")]'s assistant on a small trading station several sectors from here. Raiders attacked, and there was \
only one pod left when you got to the escape bay. You took it and launched it alone, and the crowd of terrified faces crowding at the airlock door as your pod's engines burst to \
life and sent you to this hell are forever branded into your memory."
outfit.uniform = /obj/item/clothing/under/assistantformal
outfit.uniform = /obj/item/clothing/under/misc/assistantformal
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack
if(2)
@@ -256,7 +256,7 @@
if(3)
flavour_text += "you were a doctor on one of Nanotrasen's space stations, but you left behind that damn corporation's tyranny and everything it stood for. From a metaphorical hell \
to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there."
outfit.uniform = /obj/item/clothing/under/rank/medical
outfit.uniform = /obj/item/clothing/under/rank/medical/doctor
outfit.suit = /obj/item/clothing/suit/toggle/labcoat
outfit.back = /obj/item/storage/backpack/medic
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
@@ -351,7 +351,7 @@
/datum/outfit/hotelstaff
name = "Hotel Staff"
uniform = /obj/item/clothing/under/telegram
uniform = /obj/item/clothing/under/suit/telegram
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/hotel
r_pocket = /obj/item/radio/off
@@ -371,7 +371,7 @@
/datum/outfit/hotelstaff/security
name = "Hotel Secuirty"
uniform = /obj/item/clothing/under/rank/security/blueshirt
uniform = /obj/item/clothing/under/rank/security/officer/blueshirt
shoes = /obj/item/clothing/shoes/jackboots
suit = /obj/item/clothing/suit/armor/vest/blueshirt
head = /obj/item/clothing/head/helmet/blueshirt
@@ -433,7 +433,7 @@
/datum/outfit/demonic_friend
name = "Demonic Friend"
uniform = /obj/item/clothing/under/assistantformal
uniform = /obj/item/clothing/under/misc/assistantformal
shoes = /obj/item/clothing/shoes/laceup
r_pocket = /obj/item/radio/off
back = /obj/item/storage/backpack
@@ -527,7 +527,7 @@
The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
important_info = "Work as a team with your fellow survivors and do not abandon them."
uniform = /obj/item/clothing/under/rank/security
uniform = /obj/item/clothing/under/rank/security/officer
shoes = /obj/item/clothing/shoes/jackboots
id = /obj/item/card/id/away/old/sec
r_pocket = /obj/item/restraints/handcuffs
@@ -555,7 +555,7 @@
you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
important_info = "Work as a team with your fellow survivors and do not abandon them."
uniform = /obj/item/clothing/under/rank/engineer
uniform = /obj/item/clothing/under/rank/engineering/engineer
shoes = /obj/item/clothing/shoes/workboots
id = /obj/item/card/id/away/old/eng
gloves = /obj/item/clothing/gloves/color/fyellow/old
@@ -581,7 +581,7 @@
The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
important_info = "Work as a team with your fellow survivors and do not abandon them."
uniform = /obj/item/clothing/under/rank/scientist
uniform = /obj/item/clothing/under/rank/rnd/scientist
shoes = /obj/item/clothing/shoes/laceup
id = /obj/item/card/id/away/old/sci
l_pocket = /obj/item/stack/medical/bruise_pack
@@ -703,12 +703,12 @@
if(suited)
uniform = /obj/item/clothing/under/color/grey
else
uniform = /obj/item/clothing/under/skirt/color/grey
uniform = /obj/item/clothing/under/color/jumpskirt/grey
else
if(suited)
uniform = /obj/item/clothing/under/color/random
else
uniform = /obj/item/clothing/under/skirt/color/random
uniform = /obj/item/clothing/under/color/jumpskirt/random
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
name = "ghost cafe costuming kit"
code/modules/admin/create_mob.dm
+1
View File
@@ -41,6 +41,7 @@
H.dna.features["deco_wings"] = pick(GLOB.deco_wings_list)
H.dna.features["insect_fluff"] = pick(GLOB.insect_fluffs_list)
H.dna.features["flavor_text"] = "" //Oh no.
H.dna.features["body_model"] = H.gender
SEND_SIGNAL(H, COMSIG_HUMAN_ON_RANDOMIZE)
code/modules/admin/secrets.dm
+2 -2
View File
@@ -415,8 +415,8 @@
H.fully_replace_character_name(H.real_name,newname)
H.update_mutant_bodyparts()
if(animetype == "Yes")
var/seifuku = pick(typesof(/obj/item/clothing/under/schoolgirl))
var/obj/item/clothing/under/schoolgirl/I = new seifuku
var/seifuku = pick(typesof(/obj/item/clothing/under/costume/schoolgirl))
var/obj/item/clothing/under/costume/schoolgirl/I = new seifuku
var/olduniform = H.w_uniform
H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE, FALSE)
H.equip_to_slot_or_del(I, SLOT_W_UNIFORM)
code/modules/admin/topic.dm
+1 -1
View File
@@ -1880,7 +1880,7 @@
if(ishuman(L))
var/mob/living/carbon/human/observer = L
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), SLOT_W_UNIFORM)
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit/black(observer), SLOT_W_UNIFORM)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), SLOT_SHOES)
L.Unconscious(100)
sleep(5)
code/modules/antagonists/abductor/machinery/experiment.dm
+1 -1
View File
@@ -61,7 +61,7 @@
/obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H)
var/icon/photo = null
var/g = (H.gender == FEMALE) ? "f" : "m"
var/g = (H.dna.features["body_model"] == FEMALE) ? "f" : "m"
if(H.dna.species.use_skintones)
photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]")
else
code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
+3 -3
View File
@@ -138,11 +138,11 @@
quickbind_desc = "Applies handcuffs to a struck target."
//Vanguard: Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
//Vanguard: Provides twenty seconds of greatly increased stamina regeneration and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed aswell as 50% of healed stamloss are applied to the invoker.
/datum/clockwork_scripture/vanguard
descname = "Self Stun Immunity"
name = "Vanguard"
desc = "Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
desc = "Provides twenty seconds of greatly increased stamina regeneration and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed aswell as incurring 50% of the stamina regenerated as stamina loss \
Excessive absorption will cause unconsciousness."
invocations = list("Shield me...", "...from darkness!")
channel_time = 30
@@ -152,7 +152,7 @@
primary_component = VANGUARD_COGWHEEL
sort_priority = 7
quickbind = TRUE
quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. All stuns absorbed will affect you when disabled."
quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. Part of the stuns absorbed and staminaloss healed will affect you when disabled."
/datum/clockwork_scripture/vanguard/check_special_requirements()
if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time)
code/modules/antagonists/devil/devil.dm
+3 -3
View File
@@ -414,11 +414,11 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
if(BANISH_FUNERAL_GARB)
if(ishuman(body))
var/mob/living/carbon/human/H = body
if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/burial))
if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/misc/burial))
return 1
return 0
else
for(var/obj/item/clothing/under/burial/B in range(0,body))
for(var/obj/item/clothing/under/misc/burial/B in range(0,body))
if(B.loc == get_turf(B)) //Make sure it's not in someone's inventory or something.
return 1
return 0
@@ -456,7 +456,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
return -1
currentMob.change_mob_type( /mob/living/carbon/human, targetturf, null, 1)
var/mob/living/carbon/human/H = owner.current
H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/black(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/lawyer/black(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), SLOT_SHOES)
H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), SLOT_HANDS)
H.equip_to_slot_or_del(new /obj/item/pen(H), SLOT_L_STORE)
code/modules/antagonists/devil/devil_helpers.dm
+13 -13
View File
@@ -8,19 +8,19 @@
var/obj/item/clothing/under/U = H.w_uniform
var/static/list/whiteness = list (
/obj/item/clothing/under/color/white = 2,
/obj/item/clothing/under/rank/bartender = 1,
/obj/item/clothing/under/rank/chef = 1,
/obj/item/clothing/under/rank/chief_engineer = 1,
/obj/item/clothing/under/rank/scientist = 1,
/obj/item/clothing/under/rank/chemist = 1,
/obj/item/clothing/under/rank/chief_medical_officer = 1,
/obj/item/clothing/under/rank/geneticist = 1,
/obj/item/clothing/under/rank/virologist = 1,
/obj/item/clothing/under/rank/nursesuit = 1,
/obj/item/clothing/under/rank/medical = 1,
/obj/item/clothing/under/rank/det = 1,
/obj/item/clothing/under/suit_jacket/white = 0.5,
/obj/item/clothing/under/burial = 1
/obj/item/clothing/under/rank/civilian/bartender = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer = 1,
/obj/item/clothing/under/rank/rnd/scientist = 1,
/obj/item/clothing/under/rank/medical/chemist = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer = 1,
/obj/item/clothing/under/rank/medical/geneticist = 1,
/obj/item/clothing/under/rank/medical/virologist = 1,
/obj/item/clothing/under/rank/medical/doctor/nurse = 1,
/obj/item/clothing/under/rank/medical/doctor = 1,
/obj/item/clothing/under/rank/security/detective = 1,
/obj/item/clothing/under/suit/white = 0.5,
/obj/item/clothing/under/misc/burial = 1
)
if(U && whiteness[U.type])
src.visible_message("<span class='warning'>[src] seems to have been harmed by the purity of [attacker]'s clothes.</span>", "<span class='notice'>Unsullied white clothing is disrupting your form.</span>")
code/modules/antagonists/highlander/highlander.dm
+1 -1
View File
@@ -45,7 +45,7 @@
qdel(I)
for(var/obj/item/I in H.held_items)
qdel(I)
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt/highlander(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_EARS)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_SHOES)
code/modules/antagonists/wizard/equipment/artefact.dm
+1 -1
View File
@@ -230,7 +230,7 @@
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire)
H.equip_to_slot_or_del(new hat(H), SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_SHOES)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
H.put_in_hands(new /obj/item/claymore(H), TRUE)
code/modules/awaymissions/corpse.dm
+6 -6
View File
@@ -411,7 +411,7 @@
/datum/outfit/spacebartender
name = "Space Bartender"
uniform = /obj/item/clothing/under/rank/bartender
uniform = /obj/item/clothing/under/rank/civilian/bartender
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/sneakers/black
suit = /obj/item/clothing/suit/armor/vest
@@ -467,7 +467,7 @@
/datum/outfit/nanotrasenbridgeofficercorpse
name = "Bridge Officer Corpse"
ears = /obj/item/radio/headset/heads/hop
uniform = /obj/item/clothing/under/rank/centcom_officer
uniform = /obj/item/clothing/under/rank/centcom/officer
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/sneakers/black
glasses = /obj/item/clothing/glasses/sunglasses
@@ -482,7 +482,7 @@
/datum/outfit/nanotrasencommandercorpse
name = "Nanotrasen Private Security Commander"
uniform = /obj/item/clothing/under/rank/centcom_commander
uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/bulletproof
ears = /obj/item/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/eyepatch
@@ -502,7 +502,7 @@
/datum/outfit/nanotrasensoldiercorpse
name = "NT Private Security Officer Corpse"
uniform = /obj/item/clothing/under/rank/security
uniform = /obj/item/clothing/under/rank/security/officer
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
@@ -602,7 +602,7 @@
/datum/outfit/cryobartender
name = "Cryogenic Bartender"
uniform = /obj/item/clothing/under/rank/bartender
uniform = /obj/item/clothing/under/rank/civilian/bartender
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/sneakers/black
suit = /obj/item/clothing/suit/armor/vest
@@ -639,7 +639,7 @@
/datum/outfit/lavaknight
name = "Cydonian Knight"
uniform = /obj/item/clothing/under/assistantformal
uniform = /obj/item/clothing/under/misc/assistantformal
mask = /obj/item/clothing/mask/breath
shoes = /obj/item/clothing/shoes/sneakers/black
r_pocket = /obj/item/melee/transforming/energy/sword/cx
code/modules/awaymissions/mission_code/Academy.dm
+1 -1
View File
@@ -299,7 +299,7 @@
/datum/outfit/butler
name = "Butler"
uniform = /obj/item/clothing/under/suit_jacket/really_black
uniform = /obj/item/clothing/under/suit/black_really
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/bowler
glasses = /obj/item/clothing/glasses/monocle
code/modules/cargo/exports/gear.dm
+6 -6
View File
@@ -582,18 +582,18 @@ datum/export/gear/glasses //glasses are not worth selling
cost = 10
unit_name = "fancy clothing"
k_elasticity = 1/90 //These will be what sells
export_types = list(/obj/item/clothing/under/scratch, /obj/item/clothing/under/sl_suit, /obj/item/clothing/under/rank/vice, /obj/item/clothing/under/suit_jacket, \
/obj/item/clothing/under/burial, /obj/item/clothing/under/skirt/black, /obj/item/clothing/under/captainparade, /obj/item/clothing/under/hosparademale, \
/obj/item/clothing/under/hosparadefem, /obj/item/clothing/under/assistantformal, /obj/item/clothing/under/stripeddress, /obj/item/clothing/under/redeveninggown, \
/obj/item/clothing/under/plaid_skirt, /obj/item/clothing/under/geisha, /obj/item/clothing/under/trek, /obj/item/clothing/under/rank)
export_types = list(/obj/item/clothing/under/suit/white_on_white, /obj/item/clothing/under/suit/sl, /obj/item/clothing/under/misc/vice_officer, /obj/item/clothing/under/suit/black, \
/obj/item/clothing/under/misc/burial, /obj/item/clothing/under/dress/skirt, /obj/item/clothing/under/rank/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade, \
/obj/item/clothing/under/rank/security/head_of_security/parade/female, /obj/item/clothing/under/misc/assistantformal, /obj/item/clothing/under/dress/striped, /obj/item/clothing/under/dress/redeveninggown, \
/obj/item/clothing/under/dress/skirt/plaid, /obj/item/clothing/under/costume/geisha, /obj/item/clothing/under/trek, /obj/item/clothing/under/rank)
include_subtypes = TRUE
/datum/export/gear/armored_jumpsuit
cost = 15
unit_name = "armored_jumpsuit"
k_elasticity = 1/90 //These will be what sells
export_types = list(/obj/item/clothing/under/durathread, /obj/item/clothing/under/rank/security, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/syndicate, \
/obj/item/clothing/under/rank/det, /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/security/spacepol)
export_types = list(/obj/item/clothing/under/misc/durathread, /obj/item/clothing/under/rank/security/officer, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/syndicate, \
/obj/item/clothing/under/rank/security/detective, /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/security/officer/spacepol)
exclude_types = list(/obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/under/syndicate/tacticool/skirt)
include_subtypes = TRUE
code/modules/cargo/packs/armory.dm
+1 -1
View File
@@ -188,7 +188,7 @@
/obj/item/clothing/shoes/russian,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/under/syndicate/rus_army,
/obj/item/clothing/under/soviet,
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/head/helmet/rus_ushanka,
/obj/item/clothing/suit/armor/vest/russian_coat,
code/modules/cargo/packs/costumes_toys.dm
+13 -13
View File
@@ -219,14 +219,14 @@
name = "Formalwear Crate"
desc = "You're gonna like the way you look, I guaranteed it. Contains an asston of fancy clothing."
cost = 4750 //Lots of fancy clothing that can be sold back!
contains = list(/obj/item/clothing/under/blacktango,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/lawyer/bluesuit,
contains = list(/obj/item/clothing/under/dress/blacktango,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
/obj/item/clothing/suit/toggle/lawyer,
/obj/item/clothing/under/lawyer/purpsuit,
/obj/item/clothing/under/rank/civilian/lawyer/purpsuit,
/obj/item/clothing/suit/toggle/lawyer/purple,
/obj/item/clothing/under/lawyer/blacksuit,
/obj/item/clothing/under/suit/black,
/obj/item/clothing/suit/toggle/lawyer/black,
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/neck/tie/blue,
@@ -240,11 +240,11 @@
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/under/suit_jacket/charcoal,
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit_jacket/burgundy,
/obj/item/clothing/under/suit_jacket/checkered,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/under/suit/navy,
/obj/item/clothing/under/suit/burgundy,
/obj/item/clothing/under/suit/checkered,
/obj/item/clothing/under/suit/tan,
/obj/item/lipstick/random)
crate_name = "formalwear crate"
crate_type = /obj/structure/closet/crate/wooden
@@ -277,9 +277,9 @@
contains = list(/obj/item/storage/backpack/clown,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/under/rank/clown,
/obj/item/clothing/under/rank/civilian/clown,
/obj/item/bikehorn,
/obj/item/clothing/under/rank/mime,
/obj/item/clothing/under/rank/civilian/mime,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/mask/gas/mime,
code/modules/cargo/packs/misc.dm
+3 -3
View File
@@ -274,7 +274,7 @@
name = "Funeral Supplies"
desc = "Mourn your dead properly buy sending them off with love filled notes, clean clothes, and a proper ceremony. Contains two candle packs, funeral garb, flowers, a paperbin , and crayons to help aid in religious rituals. Coffin included."
cost = 1200
contains = list(/obj/item/clothing/under/burial,
contains = list(/obj/item/clothing/under/misc/burial,
/obj/item/storage/fancy/candle_box,
/obj/item/storage/fancy/candle_box,
/obj/item/reagent_containers/food/snacks/grown/harebell,
@@ -419,8 +419,8 @@
/obj/item/dildo/custom,
/obj/item/vending_refill/kink,
/obj/item/vending_refill/kink,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/electropack/shockcollar,
/obj/item/electropack/shockcollar,
/obj/item/restraints/handcuffs/fake/kinky,
code/modules/cargo/packs/organic.dm
+1 -1
View File
@@ -380,7 +380,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cognac,
/obj/item/storage/fancy/cigarettes/cigars/havana,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/under/rank/curator,
/obj/item/clothing/under/rank/civilian/curator,
/obj/item/gun/ballistic/shotgun/lethal)
access = ACCESS_ARMORY
crate_name = "sporting crate"
code/modules/cargo/packs/security.dm
+4 -4
View File
@@ -139,16 +139,16 @@
name = "Security Clothing Crate"
desc = "Contains appropriate outfits for the station's private security force. Contains outfits for the Warden, Head of Security, and two Security Officers. Each outfit comes with a rank-appropriate jumpsuit, suit, and beret. Requires Security access to open."
cost = 3250
contains = list(/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
contains = list(/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/under/rank/warden/navyblue,
/obj/item/clothing/under/rank/security/warden/formal,
/obj/item/clothing/suit/armor/vest/warden/navyblue,
/obj/item/clothing/head/beret/sec/navywarden,
/obj/item/clothing/under/rank/head_of_security/navyblue,
/obj/item/clothing/under/rank/security/head_of_security/formal,
/obj/item/clothing/suit/armor/hos/navyblue,
/obj/item/clothing/head/beret/sec/navyhos)
crate_name = "security clothing crate"
code/modules/client/preferences.dm
+17 -6
View File
@@ -150,7 +150,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"ipc_screen" = "Sunburst",
"ipc_antenna" = "None",
"flavor_text" = "",
"meat_type" = "Mammalian"
"meat_type" = "Mammalian",
"body_model" = MALE
)
var/list/custom_names = list()
@@ -343,6 +344,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[TextPreview(features["flavor_text"])]...<BR>"
dat += "<h2>Body</h2>"
dat += "<b>Gender:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]</a><BR>"
if(gender != NEUTER && pref_species.sexes)
dat += "<b>Body Model:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=body_model'>[features["body_model"] == MALE ? "Masculine" : "Feminine"]</a><BR>"
dat += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.name]</a><BR>"
dat += "<b>Custom Species Name:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=custom_species;task=input'>[custom_species ? custom_species : "None"]</a><BR>"
dat += "<b>Random Body:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Randomize!</A><BR>"
@@ -1924,9 +1927,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
if("cock_length")
var/new_length = input(user, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Character Preference") as num|null
var/min_D = CONFIG_GET(number/penis_min_inches_prefs)
var/max_D = CONFIG_GET(number/penis_max_inches_prefs)
var/new_length = input(user, "Penis length in inches:\n([min_D]-[max_D])", "Character Preference") as num|null
if(new_length)
features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
features["cock_length"] = CLAMP(round(new_length), min_D, max_D)
if("cock_shape")
var/new_shape
@@ -1952,8 +1957,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["balls_shape"] = new_shape
if("breasts_size")
var/new_size
new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list
var/new_size = input(user, "Breast Size", "Character Preference") as null|anything in CONFIG_GET(keyed_list/breasts_cups_prefs)
if(new_size)
features["breasts_size"] = new_size
@@ -2126,16 +2130,23 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(unlock_content)
toggles ^= MEMBER_PUBLIC
if("gender")
var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) in list(MALE,FEMALE,"nonbinary","object")
var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) as null|anything in list(MALE,FEMALE,"nonbinary","object")
switch(chosengender)
if("nonbinary")
chosengender = PLURAL
features["body_model"] = pick(MALE, FEMALE)
if("object")
chosengender = NEUTER
features["body_model"] = MALE
else
features["body_model"] = chosengender
gender = chosengender
facial_hair_style = random_facial_hair_style(gender)
hair_style = random_hair_style(gender)
if("body_model")
features["body_model"] = features["body_model"] == MALE ? FEMALE : MALE
if("hotkeys")
hotkeys = !hotkeys
if(hotkeys)
code/modules/client/preferences_savefile.dm
+16 -2
View File
@@ -375,6 +375,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["name_is_always_random"] >> be_random_name
S["body_is_always_random"] >> be_random_body
S["gender"] >> gender
S["body_model"] >> features["body_model"]
S["age"] >> age
S["hair_color"] >> hair_color
S["facial_hair_color"] >> facial_hair_color
@@ -490,6 +491,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
real_name = reject_bad_name(real_name)
gender = sanitize_gender(gender, TRUE, TRUE)
features["body_model"] = sanitize_gender(features["body_model"], FALSE, FALSE, gender == FEMALE ? FEMALE : MALE)
if(!real_name)
real_name = random_unique_name(gender)
custom_species = reject_bad_name(custom_species)
@@ -545,10 +547,21 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["insect_markings"] = sanitize_inlist(features["insect_markings"], GLOB.insect_markings_list, "None")
features["insect_wings"] = sanitize_inlist(features["insect_wings"], GLOB.insect_wings_list)
features["breasts_size"] = sanitize_inlist(features["breasts_size"], GLOB.breasts_size_list, BREASTS_SIZE_DEF)
var/static/list/B_sizes
if(!B_sizes)
B_sizes = CONFIG_GET(keyed_list/breasts_cups_prefs)
B_sizes = B_sizes.Copy()
var/static/min_D
if(!min_D)
min_D = CONFIG_GET(number/penis_min_inches_prefs)
var/static/max_D
if(!max_D)
max_D = CONFIG_GET(number/penis_max_inches_prefs)
features["breasts_size"] = sanitize_inlist(features["breasts_size"], B_sizes, BREASTS_SIZE_DEF)
features["cock_length"] = sanitize_integer(features["cock_length"], min_D, max_D, COCK_SIZE_DEF)
features["breasts_shape"] = sanitize_inlist(features["breasts_shape"], GLOB.breasts_shapes_list, DEF_BREASTS_SHAPE)
features["cock_shape"] = sanitize_inlist(features["cock_shape"], GLOB.cock_shapes_list, DEF_COCK_SHAPE)
features["cock_length"] = sanitize_integer(features["cock_length"], COCK_SIZE_MIN, COCK_SIZE_MAX, COCK_SIZE_DEF)
features["balls_shape"] = sanitize_inlist(features["balls_shape"], GLOB.balls_shapes_list, DEF_BALLS_SHAPE)
features["vag_shape"] = sanitize_inlist(features["vag_shape"], GLOB.vagina_shapes_list, DEF_VAGINA_SHAPE)
features["breasts_color"] = sanitize_hexcolor(features["breasts_color"], 3, FALSE, "FFF")
@@ -599,6 +612,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["name_is_always_random"] , be_random_name)
WRITE_FILE(S["body_is_always_random"] , be_random_body)
WRITE_FILE(S["gender"] , gender)
WRITE_FILE(S["body_model"] , features["body_model"])
WRITE_FILE(S["age"] , age)
WRITE_FILE(S["hair_color"] , hair_color)
WRITE_FILE(S["facial_hair_color"] , facial_hair_color)
code/modules/clothing/head/helmet.dm
+1 -1
View File
@@ -261,7 +261,7 @@
desc = "An insidious armored combat helmet signed with Syndicate insignia. The visor is coated with a resistant paste guaranteed to withstand bright flashes perfectly."
icon_state = "infiltrator"
item_state = "infiltrator"
armor = list("melee" = 40, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
armor = list("melee" = 40, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
resistance_flags = FIRE_PROOF | ACID_PROOF
flash_protect = 2
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
code/modules/clothing/masks/boxing.dm
+1 -1
View File
@@ -22,7 +22,7 @@
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 100, "acid" = 40)
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 30, "acid" = 30)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/voice_unknown = TRUE ///This makes it so that your name shows up as unknown when wearing the mask.
code/modules/clothing/outfits/ert.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/datum/outfit/ert
name = "ERT Common"
uniform = /obj/item/clothing/under/rank/centcom_officer
uniform = /obj/item/clothing/under/rank/centcom/officer
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/headset_cent/alt
@@ -227,7 +227,7 @@
/datum/outfit/centcom_official
name = "CentCom Official"
uniform = /obj/item/clothing/under/rank/centcom_officer
uniform = /obj/item/clothing/under/rank/centcom/officer
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset/headset_cent
code/modules/clothing/outfits/standard.dm
+10 -10
View File
@@ -27,7 +27,7 @@
/datum/outfit/tournament/gangster
name = "tournament gangster"
uniform = /obj/item/clothing/under/rank/det
uniform = /obj/item/clothing/under/rank/security/detective
suit = /obj/item/clothing/suit/det_suit
glasses = /obj/item/clothing/glasses/thermal/monocle
head = /obj/item/clothing/head/fedora/det_hat
@@ -38,7 +38,7 @@
/datum/outfit/tournament/janitor
name = "tournament janitor"
uniform = /obj/item/clothing/under/rank/janitor
uniform = /obj/item/clothing/under/rank/civilian/janitor
back = /obj/item/storage/backpack
suit = null
head = null
@@ -80,7 +80,7 @@
/datum/outfit/pirate
name = "Space Pirate"
uniform = /obj/item/clothing/under/pirate
uniform = /obj/item/clothing/under/costume/pirate
shoes = /obj/item/clothing/shoes/sneakers/brown
suit = /obj/item/clothing/suit/pirate
head = /obj/item/clothing/head/bandana
@@ -113,7 +113,7 @@
/datum/outfit/tunnel_clown
name = "Tunnel Clown"
uniform = /obj/item/clothing/under/rank/clown
uniform = /obj/item/clothing/under/rank/civilian/clown
shoes = /obj/item/clothing/shoes/clown_shoes
gloves = /obj/item/clothing/gloves/color/black
mask = /obj/item/clothing/mask/gas/clown_hat
@@ -138,7 +138,7 @@
/datum/outfit/psycho
name = "Masked Killer"
uniform = /obj/item/clothing/under/overalls
uniform = /obj/item/clothing/under/misc/overalls
shoes = /obj/item/clothing/shoes/sneakers/white
gloves = /obj/item/clothing/gloves/color/latex
mask = /obj/item/clothing/mask/surgical
@@ -160,7 +160,7 @@
/datum/outfit/assassin
name = "Assassin"
uniform = /obj/item/clothing/under/suit_jacket
uniform = /obj/item/clothing/under/suit/black
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset
@@ -202,7 +202,7 @@
/datum/outfit/centcom_commander
name = "CentCom Commander"
uniform = /obj/item/clothing/under/rank/centcom_commander
uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
@@ -313,7 +313,7 @@
/datum/outfit/soviet
name = "Soviet Admiral"
uniform = /obj/item/clothing/under/soviet
uniform = /obj/item/clothing/under/costume/soviet
head = /obj/item/clothing/head/pirate/captain
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
@@ -340,7 +340,7 @@
/datum/outfit/mobster
name = "Mobster"
uniform = /obj/item/clothing/under/suit_jacket/really_black
uniform = /obj/item/clothing/under/suit/black_really
head = /obj/item/clothing/head/fedora
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/color/black
@@ -426,7 +426,7 @@
/datum/outfit/debug //Debug objs plus hardsuit
name = "Debug outfit"
uniform = /obj/item/clothing/under/patriotsuit
uniform = /obj/item/clothing/under/misc/patriotsuit
suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
glasses = /obj/item/clothing/glasses/debug
ears = /obj/item/radio/headset/headset_cent/commander
code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -197,7 +197,7 @@
desc = "An insidious combat vest designed using Syndicate nanofibers to absorb the supreme majority of kinetic blows. Although it doesn't look like it'll do too much for energy impacts."
icon_state = "infiltrator"
item_state = "infiltrator"
armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 30, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 30, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
resistance_flags = FIRE_PROOF | ACID_PROOF
strip_delay = 80
code/modules/clothing/under/_under.dm
+20 -7
View File
@@ -20,13 +20,26 @@
/obj/item/clothing/under/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
. = list()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
if(blood_DNA)
. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
if(accessory_overlay)
. += accessory_overlay
if(isinhands)
return
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
if(blood_DNA)
. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
if(accessory_overlay)
. += accessory_overlay
if(hasprimary) //checks if overlays are enabled
var/mutable_appearance/primary_worn = mutable_appearance(icon_file, "[item_color]-primary") //automagical sprite selection
primary_worn.color = primary_color //colors the overlay
. += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite.
if(hassecondary)
var/mutable_appearance/secondary_worn = mutable_appearance(icon_file, "[item_color]-secondary")
secondary_worn.color = secondary_color
. += secondary_worn
if(hastertiary)
var/mutable_appearance/tertiary_worn = mutable_appearance(icon_file, "[item_color]-tertiary")
tertiary_worn.color = tertiary_color
. += tertiary_worn
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
code/modules/clothing/under/color.dm
+22 -22
View File
@@ -1,7 +1,7 @@
/obj/item/clothing/under/color
desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
/obj/item/clothing/under/skirt/color
/obj/item/clothing/under/color/jumpskirt
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
@@ -11,7 +11,7 @@
/obj/item/clothing/under/color/random/Initialize()
..()
var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - subtypesof(/obj/item/clothing/under/skirt/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - subtypesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
@@ -20,12 +20,12 @@
new C(loc)
return INITIALIZE_HINT_QDEL
/obj/item/clothing/under/skirt/color/random
/obj/item/clothing/under/color/jumpskirt/random
icon_state = "random_jumpsuit" //Skirt variant needed
/obj/item/clothing/under/skirt/color/random/Initialize()
/obj/item/clothing/under/color/jumpskirt/random/Initialize()
..()
var/obj/item/clothing/under/skirt/color/C = pick(subtypesof(/obj/item/clothing/under/skirt/color) - /obj/item/clothing/under/skirt/color/random)
var/obj/item/clothing/under/color/jumpskirt/C = pick(subtypesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/jumpskirt/random)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.equip_to_slot_or_del(new C(H), SLOT_W_UNIFORM)
@@ -45,7 +45,7 @@
desc = "A black jumpsuit that has its sensors removed."
has_sensor = NO_SENSORS
/obj/item/clothing/under/skirt/color/black
/obj/item/clothing/under/color/jumpskirt/black
name = "black jumpskirt"
icon_state = "black_skirt"
item_state = "bl_suit"
@@ -68,7 +68,7 @@
item_state = "gy_suit"
item_color = "grey"
/obj/item/clothing/under/skirt/color/grey
/obj/item/clothing/under/color/jumpskirt/grey
name = "grey jumpskirt"
desc = "A tasteful grey jumpskirt that reminds you of the good old days."
icon_state = "grey_skirt"
@@ -91,7 +91,7 @@
item_state = "b_suit"
item_color = "blue"
/obj/item/clothing/under/skirt/color/blue
/obj/item/clothing/under/color/jumpskirt/blue
name = "blue jumpskirt"
icon_state = "blue_skirt"
item_state = "b_suit"
@@ -103,7 +103,7 @@
item_state = "g_suit"
item_color = "green"
/obj/item/clothing/under/skirt/color/green
/obj/item/clothing/under/color/jumpskirt/green
name = "green jumpskirt"
icon_state = "green_skirt"
item_state = "g_suit"
@@ -116,7 +116,7 @@
item_state = "o_suit"
item_color = "orange"
/obj/item/clothing/under/skirt/color/orange
/obj/item/clothing/under/color/jumpskirt/orange
name = "orange jumpskirt"
icon_state = "orange_skirt"
item_state = "o_suit"
@@ -129,7 +129,7 @@
item_state = "p_suit"
item_color = "pink"
/obj/item/clothing/under/skirt/color/pink
/obj/item/clothing/under/color/jumpskirt/pink
name = "pink jumpskirt"
icon_state = "pink_skirt"
item_state = "p_suit"
@@ -141,7 +141,7 @@
item_state = "r_suit"
item_color = "red"
/obj/item/clothing/under/skirt/color/red
/obj/item/clothing/under/color/jumpskirt/red
name = "red jumpskirt"
icon_state = "red_skirt"
item_state = "r_suit"
@@ -153,7 +153,7 @@
item_state = "w_suit"
item_color = "white"
/obj/item/clothing/under/skirt/color/white
/obj/item/clothing/under/color/jumpskirt/white
name = "white jumpskirt"
icon_state = "white_skirt"
item_state = "w_suit"
@@ -165,7 +165,7 @@
item_state = "y_suit"
item_color = "yellow"
/obj/item/clothing/under/skirt/color/yellow
/obj/item/clothing/under/color/jumpskirt/yellow
name = "yellow jumpskirt"
icon_state = "yellow_skirt"
item_state = "y_suit"
@@ -177,7 +177,7 @@
item_state = "b_suit"
item_color = "darkblue"
/obj/item/clothing/under/skirt/color/darkblue
/obj/item/clothing/under/color/jumpskirt/darkblue
name = "darkblue jumpskirt"
icon_state = "darkblue_skirt"
item_state = "b_suit"
@@ -189,7 +189,7 @@
item_state = "b_suit"
item_color = "teal"
/obj/item/clothing/under/skirt/color/teal
/obj/item/clothing/under/color/jumpskirt/teal
name = "teal jumpskirt"
icon_state = "teal_skirt"
item_state = "b_suit"
@@ -205,7 +205,7 @@
desc = "A magically colored jumpsuit. No sensors are attached!"
has_sensor = NO_SENSORS
/obj/item/clothing/under/skirt/color/lightpurple
/obj/item/clothing/under/color/jumpskirt/lightpurple
name = "lightpurple jumpskirt"
icon_state = "lightpurple_skirt"
item_state = "p_suit"
@@ -217,7 +217,7 @@
item_state = "g_suit"
item_color = "darkgreen"
/obj/item/clothing/under/skirt/color/darkgreen
/obj/item/clothing/under/color/jumpskirt/darkgreen
name = "darkgreen jumpskirt"
icon_state = "darkgreen_skirt"
item_state = "g_suit"
@@ -229,7 +229,7 @@
item_state = "lb_suit"
item_color = "lightbrown"
/obj/item/clothing/under/skirt/color/lightbrown
/obj/item/clothing/under/color/jumpskirt/lightbrown
name = "lightbrown jumpskirt"
icon_state = "lightbrown_skirt"
item_state = "lb_suit"
@@ -241,7 +241,7 @@
item_state = "lb_suit"
item_color = "brown"
/obj/item/clothing/under/skirt/color/brown
/obj/item/clothing/under/color/jumpskirt/brown
name = "brown jumpskirt"
icon_state = "brown_skirt"
item_state = "lb_suit"
@@ -253,7 +253,7 @@
item_state = "r_suit"
item_color = "maroon"
/obj/item/clothing/under/skirt/color/maroon
/obj/item/clothing/under/color/jumpskirt/maroon
name = "maroon jumpskirt"
icon_state = "maroon_skirt"
item_state = "r_suit"
@@ -267,7 +267,7 @@
item_color = "rainbow"
can_adjust = FALSE
/obj/item/clothing/under/skirt/color/rainbow
/obj/item/clothing/under/color/jumpskirt/rainbow
name = "rainbow jumpskirt"
desc = "A multi-colored jumpskirt!"
icon_state = "rainbow_skirt"

Some files were not shown because too many files have changed in this diff Show More