[fix][FUCK]ok so not only did i edit the base ice, i akimbo's the rep (#6698)

* [fix][FUCK]ok so not only did i edit the base ice, i akimbo's the rep

* Update KiloStation_skyrat.dmm

* spell spell

* Update CentCom_skyrat_z2.dmm

* we do a lil temp lockering

* we do a little new locker spriting

* NEW LKINE

Co-authored-by: louiseedwardstuart <bonniefluff>
This commit is contained in:
death and coding
2021-07-04 16:30:15 +01:00
committed by GitHub
co-authored by louiseedwardstuart <bonniefluff>
parent 46b294e508
commit 8a99451c66
9 changed files with 141 additions and 158 deletions
@@ -3222,19 +3222,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"alj" = (
/obj/structure/closet/secure_closet/nanotrasen_representative{
icon_state = "cabinet";
name = "\proper NT Rep's locker"
},
/obj/item/reagent_containers/food/drinks/bottle/champagne,
/obj/item/bedsheet/centcom,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/head/centhat,
/obj/item/clothing/suit/armor/vest/centcom_formal,
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/item/banner,
/obj/structure/closet/secure_closet/nanotrasen_representative/station,
/turf/open/floor/iron/grimy,
/area/command/heads_quarters/captain)
"alk" = (
+20 -28
View File
@@ -11775,6 +11775,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/science/research)
"bqs" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"bqv" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -27664,9 +27668,6 @@
/turf/open/floor/plating,
/area/maintenance/department/electrical)
"gWQ" = (
/obj/structure/sign/poster/random{
pixel_x = -32
},
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance/three,
/turf/open/floor/plating,
@@ -44513,9 +44514,6 @@
dir = 9
},
/area/science/research)
"qzw" = (
/turf/open/floor/iron/grimy,
/area/command/heads_quarters/captain/private)
"qzO" = (
/turf/open/floor/iron/showroomfloor,
/area/hallway/secondary/service)
@@ -47195,6 +47193,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/service/bar)
"saG" = (
/turf/open/floor/iron/grimy,
/area/command/heads_quarters/captain/private)
"sbm" = (
/obj/structure/showcase/cyborg/old{
dir = 4;
@@ -47961,15 +47962,6 @@
icon_state = "cabinet";
name = "\proper NT Rep's locker"
},
/obj/item/reagent_containers/food/drinks/bottle/champagne,
/obj/item/bedsheet/centcom,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/head/centhat,
/obj/item/clothing/suit/armor/vest/centcom_formal,
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/item/banner,
/turf/open/floor/iron/grimy,
/area/command/heads_quarters/captain/private)
"swA" = (
@@ -51736,10 +51728,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/commons/dorms)
"uwD" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"uwO" = (
/obj/machinery/button/door/directional/north{
id = "maint3";
@@ -55780,6 +55768,10 @@
},
/turf/open/floor/carpet,
/area/command/heads_quarters/hos)
"wQs" = (
/obj/structure/sign/poster/official,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"wQu" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -71410,7 +71402,7 @@ aNh
fbY
fbY
fbY
uwD
bqs
qOY
fbY
fbY
@@ -72179,7 +72171,7 @@ aLz
aQo
drO
fbY
qzw
saG
fYH
fXg
uwv
@@ -72951,10 +72943,10 @@ fbK
ayl
fbY
qJQ
qzw
qzw
qzw
qzw
saG
saG
saG
saG
fbY
jwi
beO
@@ -73211,7 +73203,7 @@ lyk
uvN
njE
cZM
qzw
saG
fbY
mgw
mZP
@@ -73468,7 +73460,7 @@ swc
ueb
mQs
ueb
qzw
saG
fbY
bcI
aPz
@@ -73723,7 +73715,7 @@ aSf
fbY
fbY
fbY
fbY
wQs
fbY
fbY
fbY
@@ -20745,7 +20745,11 @@
pixel_x = 8;
pixel_y = 8
},
/turf/open/floor/carpet/red,
/obj/item/folder/blue{
pixel_x = -8;
pixel_y = -2
},
/turf/open/floor/carpet/green,
/area/commons/vacant_room/office)
"cZO" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{
@@ -25550,6 +25554,10 @@
/obj/structure/sign/painting/library,
/turf/closed/wall,
/area/hallway/secondary/service)
"fPW" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/commons/vacant_room/office)
"fQj" = (
/obj/machinery/firealarm/directional/north,
/obj/structure/cable,
@@ -36097,6 +36105,7 @@
pixel_x = -6;
pixel_y = 4
},
/obj/item/paper/pamphlet/centcom/visitor_info,
/turf/open/floor/iron/grimy,
/area/commons/vacant_room/office)
"lyl" = (
@@ -36433,6 +36442,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/plating/snowed/icemoon,
/area/engineering/supermatter/room)
"lHf" = (
/obj/structure/sign/poster/official,
/turf/closed/wall,
/area/commons/vacant_room/office)
"lHi" = (
/obj/structure/cable,
/obj/structure/railing,
@@ -38899,11 +38912,15 @@
/turf/open/floor/iron,
/area/service/hydroponics/garden)
"mQs" = (
/obj/structure/chair/office{
dir = 8
},
/obj/machinery/light/directional/east,
/turf/open/floor/carpet/red,
/obj/structure/chair/comfy/brown{
color = "#c45c57";
desc = "Remarkably soft, with plush cozy cushions, premium memory-foam and covered in stain-resistant fabric. Made by Kat-Kea???!";
dir = 8;
name = "Premium Cozy Chair"
},
/obj/effect/landmark/start/nanotrasen_representative,
/turf/open/floor/carpet/green,
/area/commons/vacant_room/office)
"mQG" = (
/obj/structure/disposalpipe/segment{
@@ -39599,7 +39616,9 @@
pixel_x = -3;
pixel_y = 2
},
/turf/open/floor/carpet/red,
/obj/item/stamp/centcom,
/obj/item/pen/fourcolor,
/turf/open/floor/carpet/green,
/area/commons/vacant_room/office)
"njN" = (
/obj/structure/cable,
@@ -41651,8 +41670,9 @@
/turf/open/floor/iron,
/area/maintenance/starboard)
"orO" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
/obj/machinery/modular_computer/console/preset/command{
dir = 1
},
/turf/open/floor/iron/grimy,
/area/commons/vacant_room/office)
"orS" = (
@@ -45964,7 +45984,7 @@
/turf/open/floor/iron,
/area/science/robotics/lab)
"qJQ" = (
/obj/item/kirbyplants/random,
/obj/structure/filingcabinet,
/turf/open/floor/iron/grimy,
/area/commons/vacant_room/office)
"qJW" = (
@@ -46145,17 +46165,17 @@
/turf/open/floor/iron/white,
/area/science/mixing)
"qOY" = (
/obj/effect/mapping_helpers/airlock/abandoned,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/door/airlock/grunge{
name = "Vacant Office A"
},
/obj/structure/cable,
/obj/machinery/door/airlock/command{
name = "Representative's Office";
req_access_txt = "101"
},
/turf/open/floor/wood,
/area/commons/vacant_room/office)
"qPu" = (
@@ -49387,7 +49407,7 @@
/turf/open/floor/carpet,
/area/commons/dorms)
"swc" = (
/obj/structure/filingcabinet,
/obj/structure/closet/secure_closet/nanotrasen_representative/station,
/turf/open/floor/iron/grimy,
/area/commons/vacant_room/office)
"swA" = (
@@ -51520,16 +51540,15 @@
pixel_x = 9;
pixel_y = 9
},
/obj/item/folder/blue{
pixel_x = -8;
pixel_y = -2
},
/obj/item/pen/blue{
pixel_y = -2
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
/obj/item/folder/white{
pixel_x = -9
},
/turf/open/floor/iron/grimy,
/area/commons/vacant_room/office)
"tBr" = (
@@ -52544,7 +52563,7 @@
/turf/open/floor/iron,
/area/command/bridge)
"ueb" = (
/turf/open/floor/carpet/red,
/turf/open/floor/carpet/green,
/area/commons/vacant_room/office)
"uej" = (
/obj/effect/turf_decal/stripes/corner{
@@ -53300,7 +53319,15 @@
"uvN" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet/red,
/obj/item/stamp{
pixel_x = 7;
pixel_y = 9
},
/obj/item/stamp/denied{
pixel_x = 7;
pixel_y = 4
},
/turf/open/floor/carpet/green,
/area/commons/vacant_room/office)
"uvR" = (
/obj/structure/rack,
@@ -53936,6 +53963,10 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/cargo/storage)
"uIO" = (
/obj/structure/filingcabinet/employment,
/turf/open/floor/iron/grimy,
/area/commons/vacant_room/office)
"uJY" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -59833,7 +59864,7 @@
/turf/open/floor/iron,
/area/engineering/atmos)
"xVU" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/structure/filingcabinet/medical,
/turf/open/floor/iron/grimy,
/area/commons/vacant_room/office)
"xWa" = (
@@ -73496,7 +73527,7 @@ aNh
fbY
fbY
fbY
fbY
fPW
qOY
fbY
fbY
@@ -73751,7 +73782,7 @@ aPx
aQJ
ayl
fbY
dJO
uIO
tnZ
mAJ
dYC
@@ -75809,7 +75840,7 @@ aSf
fbY
fbY
fbY
fbY
lHf
fbY
fbY
fbY
@@ -50724,18 +50724,7 @@
/turf/open/floor/iron,
/area/command/teleporter)
"bNV" = (
/obj/structure/closet/secure_closet/nanotrasen_representative{
icon_state = "cabinet";
name = "\proper NT Rep's locker"
},
/obj/item/reagent_containers/food/drinks/bottle/champagne,
/obj/item/bedsheet/centcom,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/head/centhat,
/obj/item/clothing/suit/armor/vest/centcom_formal,
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/structure/closet/secure_closet/nanotrasen_representative/station,
/turf/open/floor/iron/dark,
/area/command/heads_quarters/captain/private)
"bNW" = (
@@ -50783,6 +50772,10 @@
pixel_y = 9
},
/obj/item/pen/fourcolor,
/obj/item/paper{
info = "We're sorry about having to stuff you into this Broom Closet Representative, we didn't want to work here either.";
name = "Sorry"
},
/turf/open/floor/carpet/green,
/area/command/heads_quarters/captain/private)
"bOb" = (
@@ -61934,18 +61934,7 @@
/turf/open/floor/wood,
/area/service/bar)
"qEr" = (
/obj/structure/closet/secure_closet/nanotrasen_representative{
icon_state = "cabinet";
name = "\proper NT Rep's locker"
},
/obj/item/reagent_containers/food/drinks/bottle/champagne,
/obj/item/bedsheet/centcom,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/head/centhat,
/obj/item/clothing/suit/armor/vest/centcom_formal,
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/structure/closet/secure_closet/nanotrasen_representative/station,
/turf/open/floor/wood,
/area/command/heads_quarters/captain/private)
"qEv" = (
+23 -34
View File
@@ -37722,18 +37722,7 @@
/turf/open/floor/iron/dark,
/area/security/prison)
"dyN" = (
/obj/structure/closet/secure_closet/nanotrasen_representative{
icon_state = "cabinet";
name = "\proper NT Rep's locker"
},
/obj/item/reagent_containers/food/drinks/bottle/champagne,
/obj/item/bedsheet/centcom,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/head/centhat,
/obj/item/clothing/suit/armor/vest/centcom_formal,
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/structure/closet/secure_closet/nanotrasen_representative/station,
/turf/open/floor/wood,
/area/command/heads_quarters/captain/private)
"dAm" = (
@@ -38500,6 +38489,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/security/processing)
"erZ" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
/turf/open/floor/carpet/executive,
/area/blueshield)
"esn" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
dir = 4
@@ -41228,11 +41222,6 @@
/obj/structure/trash_pile,
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"hmr" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
/turf/open/floor/carpet/executive,
/area/blueshield)
"hmF" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -46672,10 +46661,6 @@
},
/turf/open/floor/iron/dark,
/area/security/prison)
"mwv" = (
/obj/structure/sign/painting/meat,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"mwM" = (
/obj/structure/bookcase/random/reference,
/turf/open/floor/wood,
@@ -52359,6 +52344,10 @@
/obj/machinery/camera,
/turf/open/floor/iron/dark,
/area/medical/morgue)
"rXF" = (
/obj/structure/sign/painting/meat,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"rXY" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/darkblue/filled/warning{
@@ -52924,10 +52913,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/security/prison)
"sEL" = (
/obj/machinery/newscaster/security_unit,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"sFb" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 9
@@ -53181,6 +53166,10 @@
},
/turf/open/floor/iron,
/area/maintenance/port/fore)
"sOq" = (
/obj/machinery/newscaster/security_unit,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"sOs" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -54554,10 +54543,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/ai_monitored/security/armory)
"uaX" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"ubj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -57846,6 +57831,10 @@
/obj/machinery/power/apc/auto_name/south,
/turf/open/floor/iron/white,
/area/medical/cryo)
"wYB" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/command/heads_quarters/captain/private)
"wYY" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/stripes/line{
@@ -86608,7 +86597,7 @@ amQ
tOF
xus
jmA
uaX
wYB
mSf
akl
arV
@@ -86871,7 +86860,7 @@ akw
qGZ
gTC
klg
sEL
sOq
axt
ayL
ayT
@@ -87128,7 +87117,7 @@ arb
pvj
atc
kNm
mwv
rXF
axt
ayL
azW
@@ -87636,7 +87625,7 @@ amQ
tOF
hTf
jmA
uaX
wYB
iIX
bON
bON
@@ -91265,7 +91254,7 @@ aXd
aYE
aZV
lwp
hmr
erZ
bbw
bbw
bbw
@@ -6430,9 +6430,6 @@
/turf/open/floor/iron/dark,
/area/centcom/interlink)
"gKj" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/light{
dir = 4
},
@@ -6688,6 +6685,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/stamp/centcom,
/turf/open/floor/iron/dark,
/area/centcom/interlink)
"jik" = (
@@ -8027,11 +8025,6 @@
/obj/machinery/vending/autodrobe/all_access,
/turf/open/floor/iron/cafeteria,
/area/centcom/interlink)
"uRf" = (
/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
/obj/structure/closet/secure_closet/nanotrasen_representative,
/turf/open/floor/carpet/executive,
/area/centcom/interlink)
"uXJ" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -24363,7 +24356,7 @@ aHC
dMY
aiL
aiL
uRf
aiL
hbq
aVG
aYn
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -101,32 +101,6 @@
gloves = /obj/item/clothing/gloves/color/captain //Too iconic to be replaced with a plasma version
head = /obj/item/clothing/head/helmet/space/plasmaman/centcom_official
/obj/structure/closet/secure_closet/nanotrasen_representative
name = "\proper captain's locker"
req_access = list(ACCESS_CAPTAIN, ACCESS_CENT_GENERAL)
icon_state = "cap"
/obj/structure/closet/secure_closet/nanotrasen_representative/PopulateContents()
..()
new /obj/item/clothing/suit/armor/vest/nanotrasen_representative(src)
new /obj/item/storage/backpack/satchel/leather(src)
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/pet_carrier(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/under/rank/nanotrasen_representative(src)
new /obj/item/clothing/under/rank/nanotrasen_representative/skirt(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/nanotrasen_representative(src)
new /obj/item/clothing/head/beret/nanotrasen_representative(src)
new /obj/item/cartridge/captain(src)
new /obj/item/radio/headset/heads/nanotrasen_representative/alt(src)
new /obj/item/radio/headset/heads/nanotrasen_representative(src)
new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
new /obj/item/clothing/gloves/combat(src)
new /obj/item/storage/box/gunset/nanotrasen_representative(src)
new /obj/item/storage/photo_album/personal(src)
new /obj/item/stamp/centcom(src)
/obj/item/pda/nanotrasen_representative
name = "nanotrasen representatives PDA"
default_cartridge = /obj/item/cartridge/captain
@@ -147,3 +121,37 @@
new /obj/item/ammo_box/magazine/m45a5(src)
new /obj/item/ammo_box/magazine/m45a5(src)
new /obj/item/ammo_box/magazine/m45a5(src)
/obj/structure/closet/secure_closet/nanotrasen_representative/station
name = "\proper nanotrasen representative's locker"
req_access = list(ACCESS_CAPTAIN, ACCESS_CENT_GENERAL)
icon_state = "cc"
icon = 'modular_skyrat/modules/aesthetics/closet/closet.dmi'
/obj/structure/closet/secure_closet/nanotrasen_representative/station/PopulateContents()
..()
new /obj/item/clothing/suit/armor/vest/nanotrasen_representative(src)
new /obj/item/storage/backpack/satchel/leather(src)
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/pet_carrier(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/under/rank/nanotrasen_representative(src)
new /obj/item/clothing/under/rank/nanotrasen_representative/skirt(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/nanotrasen_representative(src)
new /obj/item/clothing/head/beret/nanotrasen_representative(src)
new /obj/item/cartridge/captain(src)
new /obj/item/radio/headset/heads/nanotrasen_representative/alt(src)
new /obj/item/radio/headset/heads/nanotrasen_representative(src)
new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
new /obj/item/clothing/gloves/combat(src)
new /obj/item/storage/box/gunset/nanotrasen_representative(src)
new /obj/item/storage/photo_album/personal(src)
new /obj/item/bedsheet/centcom(src)
new /obj/item/clothing/suit/armor/vest/centcom_formal(src)
new /obj/item/clothing/suit/hooded/wintercoat/centcom(src)
new /obj/item/clothing/head/centhat(src)
new /obj/item/clothing/head/centcom_cap(src)