Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

centcom minor changes #600

Merged
merged 3 commits into from
Nov 1, 2023
Merged

centcom minor changes #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17031f6
centcom minor changes
Fullonibus Nov 1, 2023
0aabee1
statue code removal
Fullonibus Nov 1, 2023
7e39e2e
Ell_good comeback
Fullonibus Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 35 additions & 60 deletions _maps/map_files220/generic/centcomm.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
/obj/effect/turf_decal/plaque{
layer = 3
},
/obj/structure/statue/ell_good,
/obj/structure/sign/poster/contraband/random/east,
/turf/simulated/floor/redgrid,
/area/syndicate_mothership)
Expand Down Expand Up @@ -5349,16 +5348,11 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/jail)
"dGO" = (
/obj/structure/statue/ell_good{
/obj/structure/statue/elwycco{
layer = 4;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding.";
dir = 4;
icon_state = "plaque";
name = "Comemmorative Plaque"
pixel_y = 9
},
/turf/simulated/floor/plasteel/goonplaque/memorial,
/area/centcom/ss220/park)
"dHo" = (
/obj/machinery/light/spot,
Expand All @@ -5382,12 +5376,7 @@
layer = 4;
pixel_y = 9
},
/turf/simulated/floor/plasteel{
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding.";
dir = 4;
icon_state = "plaque";
name = "Comemmorative Plaque"
},
/turf/simulated/floor/plasteel/goonplaque/memorial,
/area/centcom/ss220/park)
"dIb" = (
/obj/machinery/economy/vending/security,
Expand Down Expand Up @@ -5665,16 +5654,9 @@
/turf/simulated/wall/indestructible/riveted,
/area/centcom/ss220/library)
"dOQ" = (
/obj/structure/statue/elwycco{
layer = 4;
pixel_y = 9
},
/turf/simulated/floor/plasteel{
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding.";
dir = 4;
icon_state = "plaque";
name = "Comemmorative Plaque"
},
/obj/structure/flora/junglebush,
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/simulated/floor/grass/jungle/no_creep,
/area/centcom/ss220/park)
"dOS" = (
/obj/structure/chair/office/dark,
Expand Down Expand Up @@ -10905,12 +10887,12 @@
},
/area/centcom/ss220/admin1)
"hqY" = (
/obj/effect/turf_decal/plaque{
layer = 3
/obj/structure/flora/grass/jungle,
/obj/effect/turf_decal/siding/wideplating/dark/corner{
dir = 8
},
/obj/structure/statue/furukai,
/turf/simulated/floor/redgrid,
/area/syndicate_mothership)
/turf/simulated/floor/grass/jungle/no_creep,
/area/centcom/ss220/park)
"hra" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/ywflowers,
Expand Down Expand Up @@ -20547,16 +20529,9 @@
/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_sit)
"oks" = (
/obj/structure/statue/mooniverse{
layer = 4;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding.";
dir = 4;
icon_state = "plaque";
name = "Comemmorative Plaque"
},
/obj/structure/flora/grass/jungle,
/obj/effect/turf_decal/siding/wideplating/dark/corner,
/turf/simulated/floor/grass/jungle/no_creep,
/area/centcom/ss220/park)
"okL" = (
/obj/machinery/economy/vending/clothing,
Expand Down Expand Up @@ -25540,6 +25515,7 @@
pixel_y = 0
},
/obj/structure/flora/junglebush,
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/simulated/floor/grass/jungle/no_creep,
/area/centcom/ss220/park)
"rLD" = (
Expand Down Expand Up @@ -31426,16 +31402,11 @@
},
/area/syndicate_mothership)
"vWq" = (
/obj/structure/statue/furukai{
/obj/structure/statue/mooniverse{
layer = 4;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding.";
dir = 4;
icon_state = "plaque";
name = "Comemmorative Plaque"
},
/turf/simulated/floor/plasteel/goonplaque/memorial,
/area/centcom/ss220/park)
"vWR" = (
/obj/machinery/door/airlock/centcom{
Expand Down Expand Up @@ -32639,6 +32610,15 @@
},
/turf/simulated/floor/mineral/plastitanium,
/area/syndicate_mothership/infteam)
"wNr" = (
/obj/effect/turf_decal/plaque{
layer = 3
},
/obj/structure/statue/ell_good{
pixel_y = 6
},
/turf/simulated/floor/redgrid,
/area/syndicate_mothership)
"wNB" = (
/turf/simulated/floor/carpet/red,
/area/centcom/ss220/admin2)
Expand Down Expand Up @@ -34340,12 +34320,7 @@
layer = 4;
pixel_y = 9
},
/turf/simulated/floor/plasteel{
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding.";
dir = 4;
icon_state = "plaque";
name = "Comemmorative Plaque"
},
/turf/simulated/floor/plasteel/goonplaque/memorial,
/area/centcom/ss220/park)
"xOF" = (
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -43253,7 +43228,7 @@ gOQ
gOQ
gOQ
fnU
hqY
cFP
gHP
srn
srn
Expand Down Expand Up @@ -43510,7 +43485,7 @@ nGr
nXD
rrb
fnU
cFP
wNr
gHP
srn
srn
Expand Down Expand Up @@ -54655,7 +54630,7 @@ pGW
qvv
xGd
xkj
eVw
hqY
dGO
buT
buT
Expand Down Expand Up @@ -54914,7 +54889,7 @@ qvv
qvv
eVw
rLs
dOQ
buT
buT
buT
buT
Expand Down Expand Up @@ -55170,8 +55145,8 @@ qvv
qvv
qvv
mcG
pUg
oks
dOQ
buT
buT
buT
buT
Expand Down Expand Up @@ -55426,7 +55401,7 @@ iKO
xGd
qvv
pUg
eVw
oks
vWq
kAL
buT
Expand Down
14 changes: 0 additions & 14 deletions modular_ss220/unique_objects/code/unique_objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,6 @@
anchored = TRUE
oreAmount = 0

/obj/structure/statue/furukai
name = "София Вайт"
desc = "Загадочная девушка, ныне одна из множества офицеров синдиката. Получившая столь высокую позицию не за связи, а за свои способности. \
Движимая местью за потерю родной сестры из-за коррупционных верхушек Нанотрейзен, она вступила в Синдикат, \
где стала известна и как способный агент и как отличный инженер. Хоть ее позывной и отсылал на пушистых, в душе она их ненавидела... \
Но по итогу при смене руководства Синдиката, вскрылись множественные проблемы, скрывающиеся доселе в стенах Синдиката. \
Буквально в стенах Синдиката. Попавшие под её руководство базы имели очень специфичные методы построек, из-за чего \
нередко служили причиной их краха. "
icon = 'modular_ss220/unique_objects/icons/statuelarge.dmi'
icon_state = "furukai"
pixel_y = 7
anchored = TRUE
oreAmount = 0

/obj/structure/statue/mooniverse
name = "Неизвестный агент"
desc = "Информация на табличке под статуей исцарапана и нечитабельна... Поверх написано невнятное словосочетание из слов \"Furry\" и \"Universe\""
Expand Down
Binary file modified modular_ss220/unique_objects/icons/statuelarge.dmi
View file
Open in desktop
Binary file not shown.