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

compile fixes + initial map port

Browse Source
This commit is contained in:
Poojawa
2018-04-23 03:37:10 -05:00
parent 1c9175a9a8
commit 0d5d992732
38 changed files with 12148 additions and 9721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+2 -2
View File
@@ -1033,7 +1033,7 @@
/obj/structure/table/wood,
/obj/item/twohanded/spear,
/obj/item/storage/belt,
/turf/open/indestructible/boss/air,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"cI" = (
/obj/structure/stone_tile/cracked{
@@ -1075,7 +1075,7 @@
/obj/structure/table/wood,
/obj/item/twohanded/spear,
/obj/item/scythe,
/turf/open/indestructible/boss/air,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"cM" = (
/obj/structure/stone_tile/block{
_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
+6 -2
View File
@@ -9,7 +9,9 @@
/turf/closed/wall/mineral/plastitanium,
/area/ruin/unpowered)
"d" = (
/turf/open/floor/mineral/plastitanium,
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"e" = (
/obj/structure/shuttle/engine/propulsion{
@@ -19,7 +21,9 @@
/area/ruin/unpowered)
"f" = (
/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon,
/turf/open/floor/mineral/plastitanium,
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
(1,1,1) = {"
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+18 -5
View File
@@ -49,9 +49,8 @@
/area/ruin/space/has_grav/deepstorage/crusher)
"an" = (
/obj/machinery/conveyor{
dir = 1;
id = "bunkerrecycle";
movedir = 2
dir = 2;
id = "bunkerrecycle"
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
@@ -2985,6 +2984,20 @@
/obj/effect/baseturf_helper/asteroid/airless,
/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/power)
"rz" = (
/obj/machinery/conveyor{
dir = 6;
id = "bunkerrecycle"
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"Bb" = (
/obj/machinery/conveyor{
dir = 10;
id = "bunkerrecycle"
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
(1,1,1) = {"
aa
@@ -4610,9 +4623,9 @@ ab
ab
ab
ag
rz
an
an
an
Bb
aQ
bh
bB
_maps/RandomZLevels/snowdin.dmm
-8
View File
@@ -9441,13 +9441,11 @@
width = 6
},
/obj/docking_port/stationary{
baseturf_type = /turf/open/floor/engine;
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_top";
name = "snowdin excavation top";
turf_type = /turf/open/floor/engine;
width = 6
},
/turf/open/floor/plating,
@@ -9478,13 +9476,11 @@
/area/awaymission/snowdin/post/mining_dock)
"xP" = (
/obj/docking_port/stationary{
baseturf_type = /turf/open/floor/plating/snowed;
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_down";
name = "snowdin excavation down";
turf_type = /turf/open/floor/plating/snowed;
width = 6
},
/turf/open/floor/plating,
@@ -13821,13 +13817,11 @@
width = 5
},
/obj/docking_port/stationary{
baseturf_type = /turf/open/floor/engine;
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_top";
name = "snowdin mining top";
turf_type = /turf/open/floor/engine;
width = 5
},
/turf/open/floor/plating,
@@ -13874,13 +13868,11 @@
"Kt" = (
/obj/docking_port/stationary{
area_type = /area/awaymission/snowdin/post/mining_dock;
baseturf_type = /turf/open/floor/engine;
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_down";
name = "snowdin mining bottom";
turf_type = /turf/open/floor/engine;
width = 5
},
/turf/open/floor/plating,
_maps/map_files/BoxStation/BoxStation.dmm
+4153 -4539
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+965 -1242
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+2810 -2471
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Mining/Lavaland.dmm
-6
View File
@@ -2292,13 +2292,11 @@
"gY" = (
/obj/docking_port/stationary{
area_type = /area/lavaland/surface/outdoors;
baseturf_type = /turf/open/lava/smooth/lava_land_surface;
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_away";
name = "labor camp";
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
width = 9
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -3246,13 +3244,11 @@
"Uq" = (
/obj/docking_port/stationary{
area_type = /area/lavaland/surface/outdoors;
baseturf_type = /turf/open/lava/smooth/lava_land_surface;
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_lavaland";
name = "lavaland wastes";
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
width = 35
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -3260,13 +3256,11 @@
"Wp" = (
/obj/docking_port/stationary{
area_type = /area/lavaland/surface/outdoors;
baseturf_type = /turf/open/lava/smooth/lava_land_surface;
dir = 8;
dwidth = 3;
height = 5;
id = "mining_away";
name = "lavaland mine";
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
width = 7
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
_maps/map_files/OmegaStation/OmegaStation.dmm
+364 -343
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+574 -761
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/debug/runtimestation.dmm
+4 -6
View File
@@ -257,9 +257,8 @@
},
/area/engine/atmos)
"aO" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
on = 1
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -374,9 +373,8 @@
},
/area/engine/atmos)
"bc" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
on = 1
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8
},
/turf/open/floor/plasteel,
/area/engine/atmos)
_maps/map_files/generic/CentCom.dmm
+181 -261
View File
@@ -1918,7 +1918,7 @@
/turf/closed/indestructible/riveted,
/area/space)
"fy" = (
/obj/machinery/igniter,
/obj/machinery/igniter/on,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/tdome/arena_source)
@@ -2526,10 +2526,6 @@
/obj/machinery/capture_the_flag/red,
/turf/open/floor/circuit/green/anim,
/area/ctf)
"hH" = (
/obj/effect/landmark/shuttle_import,
/turf/open/space,
/area/space)
"hI" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -2994,19 +2990,17 @@
/turf/open/floor/plating,
/area/centcom/supply)
"jc" = (
/obj/machinery/conveyor{
dir = 1;
id = "XCCQMLoad2";
movedir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/conveyor{
dir = 1;
id = "XCCQMLoad2"
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"jd" = (
/obj/machinery/conveyor_switch/oneway{
convdir = 1;
id = "XCCQMLoad2";
pixel_x = 6
},
@@ -3074,26 +3068,24 @@
id = "XCCQMLoaddoor2";
name = "Supply Dock Loading Door"
},
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2";
movedir = 8
},
/obj/effect/turf_decal/stripes/end{
dir = 8
},
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2"
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"jl" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2";
movedir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2"
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"jm" = (
@@ -3102,23 +3094,21 @@
id = "XCCQMLoaddoor2";
name = "Supply Dock Loading Door"
},
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2";
movedir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2"
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"jn" = (
/obj/machinery/conveyor{
dir = 1;
id = "XCCQMLoad2";
movedir = 2
},
/obj/effect/turf_decal/stripes/end,
/obj/machinery/conveyor/inverted{
dir = 10;
id = "XCCQMLoad2"
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"jo" = (
@@ -3314,13 +3304,13 @@
/turf/open/floor/plasteel,
/area/centcom/supply)
"jL" = (
/obj/machinery/conveyor{
dir = 8;
id = "XCCQMLoad"
},
/obj/effect/turf_decal/stripes/end{
dir = 1
},
/obj/machinery/conveyor/inverted{
dir = 6;
id = "XCCQMLoad2"
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"jM" = (
@@ -3334,20 +3324,9 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/centcom/supply)
"jO" = (
/obj/machinery/conveyor{
dir = 1;
id = "XCCQMLoad";
movedir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/centcom/supply)
"jP" = (
/obj/machinery/conveyor_switch/oneway{
convdir = 1;
dir = 8;
id = "XCCQMLoad";
pixel_x = 6
},
@@ -3525,7 +3504,6 @@
height = 50;
id = "emergency_syndicate";
name = "Syndicate Auxillary Shuttle Dock";
turf_type = /turf/open/floor/plating/asteroid/snow;
width = 50
},
/turf/open/floor/plating/asteroid/snow/airless,
@@ -6967,21 +6945,6 @@
},
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
"tj" = (
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"tk" = (
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"tl" = (
/obj/machinery/door/airlock/centcom{
name = "Assault Pod";
opacity = 1;
req_access_txt = "150"
},
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"tn" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -7302,21 +7265,6 @@
},
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
"uf" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"ug" = (
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"uh" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"ui" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -7542,13 +7490,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/syndicate_mothership/control)
"uN" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/light,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"uO" = (
/obj/machinery/door/airlock/centcom{
name = "Shuttle Control Office";
@@ -7776,19 +7717,6 @@
/obj/item/toy/nuke,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
"vy" = (
/obj/machinery/door/airlock/centcom{
aiControlDisabled = 1;
name = "Assault Pod";
opacity = 1;
req_access_txt = "150"
},
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"vz" = (
/obj/machinery/computer/shuttle/syndicate/drop_pod,
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"vA" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/directions/engineering{
@@ -8083,13 +8011,6 @@
dir = 2
},
/area/syndicate_mothership/control)
"wq" = (
/obj/structure/chair,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"wr" = (
/obj/structure/chair{
dir = 4
@@ -8532,20 +8453,17 @@
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
"xN" = (
/obj/machinery/door/airlock/centcom{
aiControlDisabled = 1;
name = "Assault Pod";
opacity = 1;
req_access_txt = "150"
},
/obj/docking_port/mobile/assault_pod{
/obj/docking_port/stationary{
area_type = /area/syndicate_mothership/control;
dir = 1;
dwidth = 3;
name = "steel rain";
port_direction = 4;
preferred_direction = 4
height = 7;
name = "escape pod loader";
roundstart_template = /datum/map_template/shuttle/assault_pod/default;
width = 7
},
/turf/open/floor/plating,
/area/shuttle/assault_pod)
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
"xO" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -12150,7 +12068,7 @@
},
/area/tdome/tdomeobserve)
"Is" = (
/obj/machinery/igniter,
/obj/machinery/igniter/on,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/tdome/arena)
@@ -13452,7 +13370,6 @@
"My" = (
/obj/docking_port/stationary{
area_type = /area/syndicate_mothership;
baseturf_type = /turf/open/floor/plating/asteroid/snow;
dheight = 1;
dir = 8;
dwidth = 12;
@@ -13460,7 +13377,6 @@
id = "syndicate_away";
name = "syndicate recon outpost";
roundstart_template = /datum/map_template/shuttle/infiltrator/basic;
turf_type = /turf/open/floor/plating/asteroid/snow;
width = 23
},
/turf/open/floor/plating/asteroid/snow/airless,
@@ -13564,6 +13480,10 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
"VX" = (
/obj/effect/landmark/shuttle_import,
/turf/open/space/basic,
/area/space)
"Wc" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
@@ -15555,7 +15475,7 @@ fX
fX
fX
fX
fX
fY
fX
fX
fX
@@ -16326,7 +16246,7 @@ fX
fX
fX
fX
fY
fX
fX
fX
fX
@@ -17604,21 +17524,21 @@ aa
aa
aa
aa
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -17861,21 +17781,21 @@ aa
aa
aa
aa
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18118,21 +18038,21 @@ aa
aa
aa
aa
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18375,21 +18295,21 @@ aa
aa
aa
aa
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18632,21 +18552,21 @@ aa
aa
aa
aa
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -18889,21 +18809,21 @@ aa
aa
aa
aa
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
@@ -34918,11 +34838,11 @@ aa
ku
sl
ti
tj
tk
vy
tk
tj
sk
sk
sk
sk
sk
xM
yk
ku
@@ -35174,13 +35094,13 @@ hh
aa
ku
sm
tj
tk
uf
ug
uf
tk
tj
sk
sk
sk
sk
sk
sk
sk
yl
ku
aa
@@ -35431,13 +35351,13 @@ hh
aa
ku
sn
tk
uf
ug
uh
ug
uf
tk
sk
sk
sk
sk
sk
sk
sk
ym
ku
aa
@@ -35688,12 +35608,12 @@ hh
aa
ku
sm
tl
ug
uN
vz
wq
ug
sk
sk
sk
sk
sk
sk
xN
yl
ku
@@ -35945,13 +35865,13 @@ hh
aa
ku
sm
tk
uh
ug
uf
ug
uh
tk
sk
sk
sk
sk
sk
sk
sk
yl
ku
aa
@@ -36079,7 +35999,7 @@ aa
aa
aa
aa
aa
VX
aa
aa
aa
@@ -36202,13 +36122,13 @@ hh
aa
ku
so
tj
tk
uh
ug
uh
tk
tj
sk
sk
sk
sk
sk
sk
sk
yl
ku
aa
@@ -36460,11 +36380,11 @@ aa
ku
sp
tn
tj
tk
vy
tk
tj
sk
sk
sk
sk
sk
xO
xP
ku
@@ -44622,7 +44542,7 @@ aa
aa
aa
aa
hH
ad
aa
aa
aa
@@ -53659,9 +53579,9 @@ iP
jy
jD
jL
jO
jO
jO
jc
jc
jc
iO
iO
iX
_maps/shuttles/arrival_omega.dmm
+311
View File
@@ -0,0 +1,311 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/obj/structure/shuttle/engine/propulsion{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel/airless,
/area/shuttle/arrival)
"c" = (
/obj/docking_port/mobile/arrivals{
dir = 2;
dwidth = 2;
height = 16;
name = "omega arrivals shuttle";
width = 5
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/arrival)
"d" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival)
"e" = (
/obj/structure/shuttle/engine/heater{
dir = 1
},
/obj/structure/window/reinforced,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel/airless,
/area/shuttle/arrival)
"f" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/arrival)
"g" = (
/obj/structure/closet/wardrobe/grey{
anchored = 1
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/neutral/corner,
/area/shuttle/arrival)
"h" = (
/obj/structure/closet/emcloset{
anchored = 1
},
/obj/machinery/vending/wallmed{
pixel_y = 32
},
/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/head/hardhat/orange,
/obj/item/clothing/head/hardhat/orange,
/obj/item/clothing/head/hardhat/orange,
/obj/item/clothing/head/hardhat/orange,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/neutral/side,
/area/shuttle/arrival)
"i" = (
/obj/structure/closet/wardrobe/mixed{
anchored = 1
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/neutral/corner{
dir = 8
},
/area/shuttle/arrival)
"j" = (
/obj/machinery/door/airlock/shuttle,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plating,
/area/shuttle/arrival)
"k" = (
/obj/effect/turf_decal/caution{
dir = 4
},
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
/area/shuttle/arrival)
"l" = (
/turf/open/floor/plasteel/neutral,
/area/shuttle/arrival)
"m" = (
/obj/machinery/light{
dir = 4
},
/obj/structure/sign/poster/official/enlist{
pixel_x = 32
},
/turf/open/floor/plasteel/neutral/side{
dir = 8
},
/area/shuttle/arrival)
"n" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
/turf/open/floor/plasteel/neutral/corner{
dir = 4
},
/area/shuttle/arrival)
"o" = (
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
/area/shuttle/arrival)
"p" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"q" = (
/obj/structure/chair{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"r" = (
/obj/structure/chair{
dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"s" = (
/obj/structure/table/reinforced,
/obj/item/device/radio/intercom{
pixel_x = -30
},
/obj/item/paper_bin,
/obj/item/pen,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"t" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
dir = 4
},
/obj/machinery/cell_charger,
/turf/open/floor/plasteel/neutral/side{
dir = 8
},
/area/shuttle/arrival)
"u" = (
/turf/open/floor/plasteel/neutral/corner{
dir = 4
},
/area/shuttle/arrival)
"v" = (
/turf/open/floor/plasteel/neutral/side{
dir = 1
},
/area/shuttle/arrival)
"w" = (
/obj/structure/closet/crate/internals,
/obj/item/storage/firstaid/o2,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
/area/shuttle/arrival)
"x" = (
/obj/machinery/door/airlock/shuttle/glass,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"y" = (
/obj/machinery/light/small{
dir = 4
},
/obj/structure/chair/office/light,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"z" = (
/obj/machinery/computer{
dir = 1;
name = "Shuttle computer"
},
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"C" = (
/obj/structure/table/reinforced,
/obj/item/storage/pill_bottle/dice{
pixel_x = -2;
pixel_y = 8
},
/obj/item/toy/cards/deck,
/obj/machinery/requests_console{
department = "Arrival shuttle";
name = "Arrival shuttle requests console";
pixel_x = 32
},
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"F" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium,
/area/shuttle/arrival)
(1,1,1) = {"
a
d
f
j
f
p
p
d
p
p
j
F
f
a
a
a
"}
(2,1,1) = {"
b
e
g
k
n
q
q
s
q
q
k
u
f
f
p
p
"}
(3,1,1) = {"
c
d
h
l
l
l
l
l
l
l
l
v
x
y
z
p
"}
(4,1,1) = {"
b
e
i
m
o
r
r
C
r
r
t
w
f
f
p
p
"}
(5,1,1) = {"
a
d
f
f
f
p
p
d
p
p
f
F
f
a
a
a
"}
_maps/shuttles/assault_pod_default.dmm
+141
View File
@@ -0,0 +1,141 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"b" = (
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"c" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"d" = (
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"e" = (
/obj/machinery/door/airlock/centcom{
aiControlDisabled = 1;
name = "Assault Pod";
opacity = 1;
req_access_txt = "150"
},
/obj/docking_port/mobile/assault_pod{
dwidth = 3;
name = "steel rain";
port_direction = 4;
preferred_direction = 4;
timid = 1
},
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"h" = (
/obj/machinery/computer/shuttle/syndicate/drop_pod,
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"p" = (
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"t" = (
/obj/machinery/door/airlock/centcom{
aiControlDisabled = 1;
name = "Assault Pod";
opacity = 1;
req_access_txt = "150"
},
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"D" = (
/obj/structure/chair,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"H" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"L" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/light,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"R" = (
/obj/machinery/door/airlock/centcom{
name = "Assault Pod";
opacity = 1;
req_access_txt = "150"
},
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"V" = (
/turf/template_noop,
/area/template_noop)
(1,1,1) = {"
V
b
d
t
d
b
V
"}
(2,1,1) = {"
b
d
c
p
c
d
b
"}
(3,1,1) = {"
d
c
p
H
p
c
d
"}
(4,1,1) = {"
R
p
L
h
D
p
e
"}
(5,1,1) = {"
d
H
p
c
p
H
d
"}
(6,1,1) = {"
b
d
H
p
H
d
b
"}
(7,1,1) = {"
V
b
d
t
d
b
V
"}
_maps/shuttles/cargo_box.dmm
+1 -1
View File
@@ -55,7 +55,7 @@
/area/shuttle/supply)
"j" = (
/obj/machinery/conveyor{
dir = 4;
dir = 8;
id = "QMLoad"
},
/obj/machinery/door/poddoor{
_maps/shuttles/emergency_arena.dmm
+12 -8
View File
@@ -65,6 +65,10 @@
/obj/structure/healingfountain,
/turf/open/indestructible/necropolis/air,
/area/shuttle/escape/arena)
"z" = (
/obj/effect/landmark/shuttle_arena_safe,
/turf/open/indestructible/necropolis/air,
/area/shuttle/escape/arena)
(1,1,1) = {"
a
@@ -309,16 +313,16 @@ h
h
j
j
z
j
j
j
j
z
j
h
z
j
j
j
j
z
j
j
j
@@ -465,16 +469,16 @@ h
h
j
j
z
j
j
z
j
j
j
j
j
z
j
h
j
z
j
j
j
_maps/shuttles/emergency_supermatter.dmm
+2 -2
View File
@@ -112,7 +112,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aB" = (
/obj/machinery/power/supermatter_shard/hugbox{
/obj/machinery/power/supermatter_crystal/shard/hugbox{
anchored = 1;
base_icon_state = "darkmatter";
explosion_power = 20;
@@ -210,7 +210,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"aV" = (
/obj/machinery/power/supermatter_shard/hugbox{
/obj/machinery/power/supermatter_crystal/shard/hugbox{
anchored = 1;
name = "anchored supermatter shard"
},
_maps/shuttles/escape_pod_default.dmm
+71
View File
@@ -0,0 +1,71 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"B" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_1)
"G" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/status_display{
pixel_x = 32
},
/obj/machinery/computer/shuttle/pod{
pixel_x = -32
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"N" = (
/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
/obj/docking_port/mobile/pod{
port_direction = 2;
timid = 1;
dwidth = 1;
width = 3;
height = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"Q" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/pod_1)
"U" = (
/obj/structure/chair{
dir = 1
},
/obj/item/device/radio/intercom{
pixel_x = 25
},
/obj/item/storage/pod{
pixel_x = -26
},
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"Z" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_1)
(1,1,1) = {"
B
B
B
Z
"}
(2,1,1) = {"
Q
G
U
N
"}
(3,1,1) = {"
B
B
B
Z
"}
_maps/shuttles/escape_pod_large.dmm
+129
View File
@@ -0,0 +1,129 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"h" = (
/obj/structure/chair{
dir = 4
},
/obj/item/storage/pod{
pixel_x = -24
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"r" = (
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"u" = (
/obj/structure/grille,
/obj/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/pod_1)
"A" = (
/obj/structure/chair{
dir = 8
},
/obj/item/device/radio/intercom{
pixel_x = 30
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"B" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_1)
"C" = (
/obj/machinery/computer/shuttle/monastery_shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"H" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"J" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/status_display{
pixel_x = -32
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"L" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"M" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/status_display{
pixel_x = 32
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"O" = (
/obj/machinery/door/airlock/titanium{
name = "Shuttle Airlock"
},
/obj/docking_port/mobile/pod{
dwidth = 2;
height = 6;
launch_status = 0;
port_direction = 2;
timid = 1;
width = 5
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"W" = (
/turf/template_noop,
/area/template_noop)
"Z" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_1)
(1,1,1) = {"
W
B
B
u
B
Z
"}
(2,1,1) = {"
B
B
J
L
h
Z
"}
(3,1,1) = {"
u
C
r
r
r
O
"}
(4,1,1) = {"
B
B
M
H
A
Z
"}
(5,1,1) = {"
W
B
B
u
B
Z
"}
_maps/shuttles/ferry_lighthouse.dmm
+2 -3
View File
@@ -263,10 +263,9 @@
/turf/open/floor/wood,
/area/shuttle/transport)
"bg" = (
/obj/machinery/conveyor{
/obj/machinery/conveyor/inverted{
dir = 10;
id = "garbage";
verted = -1
id = "garbage"
},
/turf/open/floor/wood,
/area/shuttle/transport)
_maps/shuttles/pirate_default.dmm
+2323
View File
File diff suppressed because it is too large Load Diff
code/__DEFINES/machines.dm
+1
View File
@@ -29,6 +29,7 @@
#define BIOGENERATOR (1<<5) //Uses biomass
#define LIMBGROWER (1<<6) //Uses synthetic flesh
#define SMELTER (1<<7) //uses various minerals
#define AUTOYLATHE (1<<8) // CITADEL ADD
//Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.
//Modular computer/NTNet defines
code/__DEFINES/preferences.dm
+2 -1
View File
@@ -29,8 +29,9 @@
#define CHAT_GHOSTWHISPER (1<<7)
#define CHAT_GHOSTPDA (1<<8)
#define CHAT_GHOSTRADIO (1<<9)
#define CHAT_LOOC (1<<10)
#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO)
#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC)
#define PARALLAX_INSANE -1 //for show offs
#define PARALLAX_HIGH 0 //default.
code/controllers/subsystem/shuttle.dm
+3 -4
View File
@@ -55,8 +55,8 @@ SUBSYSTEM_DEF(shuttle)
var/list/shuttle_purchase_requirements_met = list() //For keeping track of ingame events that would unlock new shuttles, such as defeating a boss or discovering a secret item
var/lockdown = FALSE //disallow transit after nuke goes off
var/auto_call = 72000 //CIT CHANGE - time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.
var/auto_call = 72000 //CIT CHANGE - time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.
/datum/controller/subsystem/shuttle/Initialize(timeofday)
ordernum = rand(1, 9000)
@@ -554,7 +554,6 @@ SUBSYSTEM_DEF(shuttle)
var/obj/docking_port/stationary/transit/new_transit_dock = new(midpoint)
new_transit_dock.assigned_turfs = proposed_zone
new_transit_dock.name = "Transit for [M.id]/[M.name]"
new_transit_dock.turf_type = transit_path
new_transit_dock.owner = M
new_transit_dock.assigned_area = A
@@ -700,4 +699,4 @@ SUBSYSTEM_DEF(shuttle)
var/obj/machinery/computer/camera_advanced/shuttle_docker/C = V
C.update_hidden_docking_ports(remove_images, add_images)
QDEL_LIST(remove_images)
QDEL_LIST(remove_images)
code/controllers/subsystem/ticker.dm
+4 -4
View File
@@ -128,14 +128,14 @@ SUBSYSTEM_DEF(ticker)
login_music = pick(music)
else
login_music = "[global.config.directory]/title_music/sounds/[pick(music)]"
/*
crewobjlist = typesof(/datum/objective/crew)
miscreantobjlist = (typesof(/datum/objective/miscreant) - /datum/objective/miscreant)
for(var/hoorayhackyshit in crewobjlist) //taken from old Hippie's "job2obj" proc with adjustments.
var/datum/objective/crew/obj = hoorayhackyshit //dm is not a sane language in any way, shape, or form.
var/list/availableto = splittext(initial(obj.jobs),",")
for(var/job in availableto)
crewobjjobs["[job]"] += list(obj)
crewobjjobs["[job]"] += list(obj) */
if(!GLOB.syndicate_code_phrase)
GLOB.syndicate_code_phrase = generate_code_phrase()
@@ -324,12 +324,12 @@ SUBSYSTEM_DEF(ticker)
GLOB.start_state = new /datum/station_state()
GLOB.start_state.count()
//assign crew objectives and generate miscreants
/* //assign crew objectives and generate miscreants
if(CONFIG_GET(flag/allow_extended_miscreants) && GLOB.master_mode == "extended")
GLOB.miscreants_allowed = TRUE
if(CONFIG_GET(flag/allow_miscreants) && GLOB.master_mode != "extended")
GLOB.miscreants_allowed = TRUE
generate_crew_objectives()
generate_crew_objectives() */
var/list/adm = get_admin_counts()
var/list/allmins = adm["present"]
code/game/objects/items/melee/misc.dm
+1 -1
View File
@@ -339,7 +339,7 @@
/obj/item/melee/roastingstick/Initialize()
. = ..()
if (!ovens)
ovens = typecacheof(list(/obj/singularity, /obj/machinery/power/supermatter_crystal/crystal, /obj/structure/bonfire, /obj/structure/destructible/clockwork/massive/ratvar))
ovens = typecacheof(list(/obj/singularity, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire, /obj/structure/destructible/clockwork/massive/ratvar))
/obj/item/melee/roastingstick/attack_self(mob/user)
on = !on
code/game/objects/items/storage/dakis.dm
+10 -6
View File
@@ -3,22 +3,26 @@
//////////////////////////////////
/obj/item/storage/daki
name = "dakimakura"
name = "dakimakura"
desc = "A large pillow depicting a girl in a compromising position. Featuring as many dimensions as you."
icon = 'icons/obj/daki.dmi'
icon_state = "daki_base"
slot_flags = SLOT_BACK
storage_slots = 3
w_class = 4
max_w_class = 3
max_combined_w_class = 21
var/cooldowntime = 20
var/static/list/dakimakura_options = list("Callie","Casca","Chaika","Elisabeth","Foxy Grandpa","Haruko","Holo","Ian","Jolyne","Kurisu","Marie","Mugi","Nar'Sie","Patchouli","Plutia","Rei","Reisen","Naga","Squid","Squigly","Tomoko","Toriel","Umaru","Yaranaika","Yoko") //Kurisu is the ideal girl." - Me, Logos.
/obj/item/storage/daki/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.max_combined_w_class = 21
STR.max_items = 3
STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
/obj/item/storage/daki/attack_self(mob/living/user)
var/body_choice
var/custom_name
if(icon_state == "daki_base")
body_choice = input("Pick a body.") in dakimakura_options
icon_state = "daki_[body_choice]"
code/modules/mob/dead/new_player/new_player.dm
+2 -2
View File
@@ -376,11 +376,11 @@
if(GLOB.highlander)
to_chat(humanc, "<span class='userdanger'><i>THERE CAN BE ONLY ONE!!!</i></span>")
humanc.make_scottish()
if(prob(5) && !issilicon(humanc) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed && ROLE_MISCREANT in humanc.client.prefs.be_special)
/* if(prob(5) && !issilicon(humanc) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed && ROLE_MISCREANT in humanc.client.prefs.be_special)
SSticker.generate_miscreant_objectives(humanc.mind)
else
if(CONFIG_GET(flag/allow_crew_objectives))
SSticker.generate_individual_objectives(humanc.mind)
SSticker.generate_individual_objectives(humanc.mind) */
if(GLOB.summon_guns_triggered)
give_guns(humanc)
code/modules/mob/living/carbon/monkey/life.dm
+14
View File
@@ -1,4 +1,10 @@
#define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
#define HEAT_DAMAGE_LEVEL_2 3 //Amount of damage applied when your body temperature passes the 400K point
#define HEAT_DAMAGE_LEVEL_3 10 //Amount of damage applied when your body temperature passes the 460K point and you are on fire
#define COLD_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when your body temperature just passes the 260.15k safety point
#define COLD_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when your body temperature passes the 200K point
#define COLD_DAMAGE_LEVEL_3 3 //Amount of damage applied when your body temperature passes the 120K point
/mob/living/carbon/monkey
@@ -170,3 +176,11 @@
adjust_bodytemperature(BODYTEMP_HEATING_MAX)
SendSignal(COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
#undef HEAT_DAMAGE_LEVEL_1
#undef HEAT_DAMAGE_LEVEL_2
#undef HEAT_DAMAGE_LEVEL_3
#undef COLD_DAMAGE_LEVEL_1
#undef COLD_DAMAGE_LEVEL_2
#undef COLD_DAMAGE_LEVEL_3
modular_citadel/code/datums/uplink_items_cit.dm
-2
View File
@@ -128,8 +128,6 @@
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
resistance_flags = FLAMMABLE
max_integrity = 150
modular_citadel/code/game/machinery/cryopod.dm
+4 -4
View File
@@ -173,8 +173,8 @@
find_control_computer()
return ..()
/obj/machinery/cryopod/proc/find_control_computer(urgent = 0)
for(var/obj/machinery/computer/cryopod/C in area_contents(get_area(src)))
/obj/machinery/cryopod/proc/find_control_computer(urgent = 0,area/A)
for(var/obj/machinery/computer/cryopod/C in A)
control_computer = C
break
@@ -417,7 +417,7 @@
if(!Adjacent(user))
return
if(target == user)
visible_message("[user] starts climbing into the cryo pod.")
else
@@ -426,7 +426,7 @@
if(occupant)
to_chat(user, "<span class='boldnotice'>\The [src] is in use.</span>")
return
close_machine(target)
to_chat(target, "<span class='boldnotice'>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</span>")
modular_citadel/code/game/machinery/wishgranter.dm
+1 -1
View File
@@ -38,7 +38,7 @@
to_chat(user, "[powah] materializes into your hands!")
else
to_chat(user, "[powah] materializes onto the floor.")
var/obj/machinery/power/supermatter_shard/powerwish = new /obj/machinery/power/supermatter_shard(loc)
var/obj/machinery/power/supermatter_crystal/powerwish = new /obj/machinery/power/supermatter_crystal(loc)
powerwish.damage = 700 //right at the emergency threshold
powerwish.produces_gas = FALSE
charges--
modular_citadel/code/game/objects/items/storage/firstaid.dm
+16 -7
View File
@@ -39,9 +39,14 @@
throw_range = 7
var/empty = FALSE
item_state = "firstaid"
w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 5 //half that of regular kits
storage_slots = 5
/obj/item/storage/hypospraykit/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.max_combined_w_class = 5
STR.max_items = 5
STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
/obj/item/storage/hypospraykit/regular
icon_state = "firstaid-mini"
@@ -107,7 +112,6 @@
name = "combat hypospray kit"
desc = "A hypospray kit best suited for combat situations."
icon_state = "tactical-mini"
max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/hypospraykit/tactical/PopulateContents()
if(empty)
@@ -121,9 +125,14 @@
name = "deluxe hypospray kit"
desc = "A kit containing a Deluxe hypospray and Vials."
icon_state = "tactical-mini"
max_w_class = WEIGHT_CLASS_NORMAL
storage_slots = 6
max_combined_w_class = 6
/obj/item/storage/hypospraykit/cmo/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.max_combined_w_class = 6
STR.max_items = 6
STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
/obj/item/storage/hypospraykit/cmo/PopulateContents()
if(empty)
modular_citadel/code/modules/custom_loadout/custom_items.dm
+9 -5
View File
@@ -316,13 +316,17 @@
icon_override = 'icons/mob/custom_w.dmi'
icon_state = "darksheath"
item_state = "darksheath"
storage_slots = 1
rustle_jimmies = FALSE
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_BULKY
can_hold = list(
/obj/item/storage/belt/sabre/darksabre/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 1
STR.rustle_sound = FALSE
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.can_hold = typecacheof(list(
/obj/item/toy/sword/darksabre
)
))
/obj/item/clothing/neck/cloak/green
name = "Generic Green Cloak"
modular_citadel/code/modules/custom_loadout/load_to_mob.dm
+1 -1
View File
@@ -54,7 +54,7 @@
var/obj/item/loaded = loaded_atom
var/obj/item/storage/S = H.get_item_by_slot(slot_back)
if(istype(S))
S.handle_item_insertion(loaded, TRUE, H) //Force it into their backpack
S.SendSignal(COMSIG_TRY_STORAGE_INSERT,loaded, TRUE, H) //Force it into their backpack
continue
if(!H.put_in_hands(loaded)) //They don't have one/somehow that failed, put it in their hands
loaded.forceMove(T) //Guess we're just dumping it on the floor!
modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+8 -9
View File
@@ -158,16 +158,15 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
desc = "Fetch the thing!"
icon = 'icons/mob/dogborg.dmi'
icon_state = "dbag"
//Can hold one big item at a time. Drops contents on unequip.(see inventory.dm)
w_class = 5
max_w_class = 2
max_combined_w_class = 2
storage_slots = 1
collection_mode = 0
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear)
w_class = WEIGHT_CLASS_BULKY
/obj/item/storage/bag/borgdelivery/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.max_combined_w_class = 5
STR.max_items = 1
STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
//Tongue stuff
/obj/item/soap/tongue
modular_citadel/code/modules/vore/eating/digest_act_vr.dm
+1 -1
View File
@@ -5,7 +5,7 @@
// Ye default implementation.
/obj/item/proc/digest_act(var/atom/movable/item_storage = null)
for(var/obj/item/O in contents)
if(istype(O,/obj/item/storage/internal)) //Dump contents from dummy pockets.
if(istype(O,/obj/item/storage)) //Dump contents from dummy pockets.
for(var/obj/item/SO in O)
if(item_storage)
SO.forceMove(item_storage)
tgstation.dme
+2 -13
View File
@@ -289,7 +289,7 @@
#include "code\datums\mind.dm"
#include "code\datums\mutable_appearance.dm"
#include "code\datums\mutations.dm"
#include "code\datums\numbered_display.dm"
#include "code\datums\numbered_display.dm"
#include "code\datums\outfit.dm"
#include "code\datums\position_point_vector.dm"
#include "code\datums\profiling.dm"
@@ -893,7 +893,6 @@
#include "code\game\objects\items\storage\dakis.dm"
#include "code\game\objects\items\storage\fancy.dm"
#include "code\game\objects\items\storage\firstaid.dm"
#include "code\game\objects\items\storage\internal.dm"
#include "code\game\objects\items\storage\lockbox.dm"
#include "code\game\objects\items\storage\secure.dm"
#include "code\game\objects\items\storage\storage.dm"
@@ -1067,7 +1066,7 @@
#include "code\modules\admin\verbs\ak47s.dm"
#include "code\modules\admin\verbs\atmosdebug.dm"
#include "code\modules\admin\verbs\bluespacearty.dm"
#include "code\modules\admin\verbs\borgpanel.dm"
#include "code\modules\admin\verbs\borgpanel.dm"
#include "code\modules\admin\verbs\BrokenInhands.dm"
#include "code\modules\admin\verbs\buildmode.dm"
#include "code\modules\admin\verbs\cinematic.dm"
@@ -1351,7 +1350,6 @@
#include "code\modules\cargo\expressconsole.dm"
#include "code\modules\cargo\order.dm"
#include "code\modules\cargo\packs.dm"
#include "code\modules\cargo\vg_clothing_packs.dm"
#include "code\modules\cargo\exports\gear.dm"
#include "code\modules\cargo\exports\intel.dm"
#include "code\modules\cargo\exports\large_objects.dm"
@@ -2715,15 +2713,6 @@
#include "modular_citadel\code\modules\admin\holder2.dm"
#include "modular_citadel\code\modules\admin\secrets.dm"
#include "modular_citadel\code\modules\admin\topic.dm"
#include "modular_citadel\code\modules\antagonists\cit_crewobjectives.dm"
#include "modular_citadel\code\modules\antagonists\cit_miscreants.dm"
#include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_cargo.dm"
#include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_civilian.dm"
#include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_command.dm"
#include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_engineering.dm"
#include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_medical.dm"
#include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_science.dm"
#include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_security.dm"
#include "modular_citadel\code\modules\antagonists\cult\blood_magic.dm"
#include "modular_citadel\code\modules\arousal\arousal.dm"
#include "modular_citadel\code\modules\arousal\organs\breasts.dm"