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

update master

Browse Source
This commit is contained in:
kevinz000
2017-08-29 20:46:38 -07:00
parent 8f4a6133f9 0b82132443
commit f9c0c6df3d
308 changed files with 1594 additions and 5376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CONTRIBUTING.md
+4
View File
@@ -233,6 +233,8 @@ This prevents nesting levels from getting deeper then they need to be.
* All changes to the database's layout(schema) must be specified in the database changelog in SQL, as well as reflected in the schema files
* Any time the schema is changed the `schema_revision` table and `DB_MAJOR_VERSION` or `DB_MINOR_VERSION` defines must be incremented.
* Queries must never specify the database, be it in code, or in text files in the repo.
@@ -246,6 +248,8 @@ This prevents nesting levels from getting deeper then they need to be.
* Do not divide when you can easily convert it to multiplication. (ie `4/2` should be done as `4*0.5`)
* If you used regex to replace code during development of your code, post the regex in your PR for the benefit of future developers and downstream users.
#### Enforced not enforced
The following coding styles are not only not enforced at all, but are generally frowned upon to change for little to no reason:
SQL/database_changelog.txt.rej
-15
View File
@@ -1,15 +0,0 @@
diff a/SQL/database_changelog.txt b/SQL/database_changelog.txt (rejected hunks)
@@ -1,10 +1,10 @@
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
-The latest database version is 3.1; The query to update the schema revision table is:
+The latest database version is 3.0; The query to update the schema revision table is:
-UPDATE `schema_revision` SET major = 3, minor = 1 LIMIT 1;
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (3, 0);
or
-UPDATE `SS13_schema_revision` SET major = 3, minor = 1 LIMIT 1;
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (3, 0);
----------------------------------------------------
_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm (rejected hunks)
@@ -269,7 +269,7 @@
"W" = (
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
_maps/RandomRuins/SpaceRuins/mechtransport.dmm
+6 -24
View File
@@ -10,10 +10,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/mechtransport)
"d" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/ruin/space/has_grav/powered/mechtransport)
"e" = (
/turf/closed/wall/mineral/titanium,
@@ -63,10 +60,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav/powered/mechtransport)
"o" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/ruin/space/has_grav/powered/mechtransport)
"p" = (
/obj/machinery/door/airlock/hatch{
@@ -76,10 +70,7 @@
/turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/powered/mechtransport)
"q" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/ruin/space/has_grav/powered/mechtransport)
"r" = (
/obj/effect/decal/cleanable/dirt,
@@ -200,26 +191,17 @@
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"T" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/ruin/space/has_grav/powered/mechtransport)
"U" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/ruin/space/has_grav/powered/mechtransport)
"V" = (
/obj/item/stack/rods,
/turf/template_noop,
/area/template_noop)
"W" = (
/turf/closed/wall/shuttle{
icon_state = "swall15";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/ruin/space/has_grav/powered/mechtransport)
"X" = (
/obj/structure/shuttle/engine/propulsion,
_maps/RandomZLevels/Academy.dmm
+4 -14
View File
@@ -495,15 +495,10 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/academy/classrooms)
"bG" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/academy/classrooms)
"bH" = (
/turf/closed/wall/shuttle{
icon_state = "swallc1"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/academy/classrooms)
"bI" = (
/obj/machinery/light{
@@ -603,10 +598,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/awaymission/academy/classrooms)
"bW" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/academy/classrooms)
"bX" = (
/obj/effect/decal/cleanable/ash,
@@ -727,9 +719,7 @@
/turf/open/floor/plasteel,
/area/awaymission/academy/classrooms)
"cs" = (
/turf/closed/wall/shuttle{
icon_state = "swall1"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/academy/classrooms)
"ct" = (
/obj/structure/chair,
_maps/RandomZLevels/centcomAway.dmm
+19 -88
View File
@@ -365,10 +365,7 @@
/turf/open/floor/plasteel/vault{
dir = 5
},
/turf/closed/wall/shuttle{
icon_state = "swall_f10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"bs" = (
/obj/structure/closet/crate,
@@ -429,16 +426,10 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
"bD" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"bE" = (
/turf/closed/wall/shuttle{
icon_state = "swall8";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"bF" = (
/obj/machinery/door/airlock/external{
@@ -447,22 +438,13 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
"bG" = (
/turf/closed/wall/shuttle{
icon_state = "swall4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"bH" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"bI" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"bJ" = (
/obj/structure/chair/comfy/brown,
@@ -557,19 +539,10 @@
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"bZ" = (
/turf/open/floor/plasteel/shuttle,
/turf/closed/wall/shuttle{
icon_state = "swall_f5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"ca" = (
/turf/open/floor/plating,
/turf/closed/wall/shuttle{
dir = 2;
icon_state = "swall_f10";
layer = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"cb" = (
/obj/item/paper_bin,
@@ -667,13 +640,7 @@
/turf/closed/wall/r_wall,
/area/awaymission/centcomAway/maint)
"cw" = (
/turf/open/floor/plasteel/vault{
dir = 5
},
/turf/closed/wall/shuttle{
icon_state = "swall_f5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"cx" = (
/obj/machinery/door/airlock/maintenance_hatch{
@@ -682,13 +649,7 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
"cy" = (
/turf/open/floor/plasteel/vault{
dir = 5
},
/turf/closed/wall/shuttle{
icon_state = "swall_f9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"cz" = (
/turf/closed/wall,
@@ -726,10 +687,7 @@
/turf/open/floor/plasteel/hydrofloor,
/area/awaymission/centcomAway/cafe)
"cI" = (
/turf/closed/wall/shuttle{
icon_state = "swallc1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"cJ" = (
/obj/structure/table/reinforced,
@@ -770,10 +728,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
"cQ" = (
/turf/closed/wall/shuttle{
icon_state = "swallc2";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"cR" = (
/turf/open/floor/plating,
@@ -930,10 +885,7 @@
},
/area/awaymission/centcomAway/cafe)
"du" = (
/turf/closed/wall/shuttle{
icon_state = "swall0";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"dv" = (
/obj/structure/closet/crate,
@@ -1061,10 +1013,7 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/cafe)
"dR" = (
/turf/closed/wall/shuttle{
icon_state = "swall2";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"dS" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end/west,
@@ -1199,23 +1148,13 @@
/turf/open/floor/plasteel/red,
/area/awaymission/centcomAway/cafe)
"eq" = (
/turf/open/floor/plating,
/turf/closed/wall/shuttle{
icon_state = "swall_f5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"er" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"es" = (
/turf/closed/wall/shuttle{
icon_state = "swallc4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"et" = (
/obj/machinery/door/airlock/hatch{
@@ -2054,21 +1993,13 @@
/turf/open/floor/plating,
/area/awaymission/centcomAway/hangar)
"hv" = (
/turf/open/floor/plating,
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/turf/closed/wall/shuttle{
icon_state = "swall_f5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"hw" = (
/turf/open/floor/plasteel/black,
/turf/closed/wall/shuttle{
icon_state = "swall_f9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/centcomAway/hangar)
"hx" = (
/obj/structure/table,
_maps/RandomZLevels/moonoutpost19.dmm
+11 -54
View File
@@ -8006,11 +8006,7 @@
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
},
/turf/closed/wall/shuttle{
dir = 3;
icon_state = "swall_f10";
layer = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8270,19 +8266,13 @@
name = "MO19 Arrivals"
})
"ly" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"lz" = (
/turf/closed/wall/shuttle{
icon_state = "swall8";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8295,19 +8285,13 @@
name = "MO19 Arrivals"
})
"lB" = (
/turf/closed/wall/shuttle{
icon_state = "swall4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"lC" = (
/turf/closed/wall/shuttle{
icon_state = "swall1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -8528,10 +8512,7 @@
name = "MO19 Arrivals"
})
"lY" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9122,10 +9103,7 @@
name = "MO19 Arrivals"
})
"mX" = (
/turf/closed/wall/shuttle{
icon_state = "swall2";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9194,24 +9172,13 @@
name = "MO19 Arrivals"
})
"nd" = (
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
},
/turf/closed/wall/shuttle{
icon_state = "swall_f5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
})
"ne" = (
/turf/open/floor/plasteel/shuttle,
/turf/closed/wall/shuttle{
icon_state = "swall_f10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9306,10 +9273,7 @@
name = "MO19 Arrivals"
})
"nn" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
@@ -9409,14 +9373,7 @@
name = "MO19 Arrivals"
})
"nv" = (
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
heat_capacity = 1e+006
},
/turf/closed/wall/shuttle{
icon_state = "swall_f9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "MO19 Arrivals"
_maps/RandomZLevels/research.dmm
+1 -4
View File
@@ -4403,10 +4403,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
/turf/closed/wall/shuttle{
icon_state = "swall_f9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/research/exterior)
"mA" = (
/obj/structure/chair{
_maps/RandomZLevels/spacebattle.dmm
+20 -68
View File
@@ -540,20 +540,13 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"bU" = (
/turf/closed/wall/shuttle{
icon_state = "swall14"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"bV" = (
/turf/closed/wall/shuttle{
icon_state = "swall12"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"bW" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"bX" = (
/obj/structure/shuttle/engine/propulsion/burst/left{
@@ -594,9 +587,7 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"ce" = (
/turf/closed/wall/shuttle{
icon_state = "swall3"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"cf" = (
/obj/structure/shuttle/engine/propulsion{
@@ -681,17 +672,13 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"cs" = (
/turf/closed/wall/shuttle{
icon_state = "swall7"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"ct" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/awaymission/spacebattle/cruiser)
"cu" = (
/turf/closed/wall/shuttle{
icon_state = "swallc2"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"cv" = (
/obj/machinery/power/smes/magical{
@@ -814,9 +801,7 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"cR" = (
/turf/closed/wall/shuttle{
icon_state = "swallc3"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"cS" = (
/obj/effect/mob_spawn/human/engineer{
@@ -937,16 +922,10 @@
/turf/open/floor/plasteel/bar,
/area/awaymission/spacebattle/cruiser)
"do" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"dp" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"dq" = (
/turf/open/floor/plasteel{
@@ -973,24 +952,17 @@
},
/area/awaymission/spacebattle/cruiser)
"dt" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"du" = (
/obj/effect/decal/cleanable/blood,
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"dv" = (
/turf/closed/wall/shuttle{
icon_state = "swall15"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"dw" = (
/turf/closed/wall/shuttle{
icon_state = "swall11"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"dx" = (
/obj/structure/chair,
@@ -1305,10 +1277,7 @@
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
"eB" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"eC" = (
/obj/structure/table/reinforced,
@@ -1344,15 +1313,10 @@
/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"eI" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"eJ" = (
/turf/closed/wall/shuttle{
icon_state = "swallc4"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"eK" = (
/turf/open/floor/mineral/plastitanium,
@@ -1494,10 +1458,7 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"fk" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"fl" = (
/obj/machinery/door/airlock/external,
@@ -1939,9 +1900,7 @@
/area/awaymission/spacebattle/cruiser)
"gE" = (
/obj/effect/decal/cleanable/blood,
/turf/closed/wall/shuttle{
icon_state = "swall3"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"gF" = (
/obj/effect/mob_spawn/human/doctor{
@@ -2228,10 +2187,7 @@
},
/area/awaymission/spacebattle/syndicate7)
"hH" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"hI" = (
/obj/structure/table/reinforced,
@@ -2333,18 +2289,14 @@
/turf/open/floor/plasteel/white,
/area/awaymission/spacebattle/cruiser)
"ia" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"ib" = (
/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/plasteel/freezer,
/area/awaymission/spacebattle/cruiser)
"ic" = (
/turf/closed/wall/shuttle{
icon_state = "swall1"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
"id" = (
/obj/item/storage/firstaid/regular,
_maps/RandomZLevels/undergroundoutpost45.dmm
+6 -23
View File
@@ -55,19 +55,13 @@
name = "UO45 Central Hall"
})
"ah" = (
/turf/closed/wall/shuttle{
icon_state = "swallc1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
})
"ai" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
@@ -231,19 +225,13 @@
name = "UO45 Central Hall"
})
"av" = (
/turf/closed/wall/shuttle{
icon_state = "swallc3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
})
"aw" = (
/turf/closed/wall/shuttle{
icon_state = "swall8";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
@@ -286,10 +274,7 @@
name = "UO45 Central Hall"
})
"aA" = (
/turf/closed/wall/shuttle{
icon_state = "swall4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
@@ -318,9 +303,7 @@
name = "UO45 Central Hall"
})
"aE" = (
/turf/closed/wall/shuttle{
icon_state = "swallc4"
},
/turf/closed/wall/mineral/titanium,
/area/awaycontent/a1{
has_gravity = 1;
name = "UO45 Central Hall"
_maps/RandomZLevels/wildwest.dmm
+7 -21
View File
@@ -2094,28 +2094,20 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gK" = (
/turf/closed/wall/shuttle{
icon_state = "swall8"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gL" = (
/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/mineral/titanium/yellow,
/area/awaymission/wwrefine)
"gM" = (
/turf/closed/wall/shuttle{
icon_state = "swall4"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gN" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gO" = (
/turf/closed/wall/shuttle{
icon_state = "swall3"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gP" = (
/obj/structure/chair,
@@ -2125,22 +2117,16 @@
/turf/open/floor/mineral/titanium/yellow,
/area/awaymission/wwrefine)
"gR" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gS" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/awaymission/wwrefine)
"gT" = (
/turf/closed/wall/shuttle{
icon_state = "swallc2"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gU" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9"
},
/turf/closed/wall/mineral/titanium,
/area/awaymission/wwrefine)
"gV" = (
/obj/effect/landmark/awaystart,
_maps/boxstation.json
+2 -1
View File
@@ -3,5 +3,6 @@
"map_path": "map_files/BoxStation",
"map_file": "BoxStation.dmm",
"minetype": "lavaland",
"transition_config": "default"
"transition_config": "default",
"allow_custom_shuttles": "yes"
}
_maps/cerestation.json
+2 -1
View File
@@ -3,5 +3,6 @@
"map_path": "map_files/Cerestation",
"map_file": "cerestation.dmm",
"minetype": "lavaland",
"transition_config": "default"
"transition_config": "default",
"allow_custom_shuttles": "yes"
}
_maps/deltastation.json
+2 -1
View File
@@ -3,5 +3,6 @@
"map_path": "map_files/Deltastation",
"map_file": "DeltaStation2.dmm",
"minetype": "lavaland",
"transition_config": "default"
"transition_config": "default",
"allow_custom_shuttles": "yes"
}
_maps/map_files/BoxStation/BoxStation.dmm
+1 -3
View File
@@ -19,9 +19,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"aad" = (
/turf/closed/wall/shuttle{
icon_state = "wall3"
},
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"aae" = (
/obj/effect/landmark/carpspawn,
_maps/map_files/MetaStation/MetaStation.dmm
+1 -3
View File
@@ -79656,9 +79656,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"cVW" = (
/turf/closed/wall/shuttle{
icon_state = "swall1"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"cVX" = (
/obj/structure/tank_dispenser/oxygen{
_maps/metastation.json
+1
View File
@@ -4,4 +4,5 @@
"map_file": "MetaStation.dmm",
"minetype": "lavaland",
"transition_config": "default"
"allow_custom_shuttles": "yes"
}
_maps/omegastation.json
+2 -1
View File
@@ -3,5 +3,6 @@
"map_path": "map_files/OmegaStation",
"map_file": "OmegaStation.dmm",
"minetype": "lavaland",
"transition_config": "default"
"transition_config": "default",
"allow_custom_shuttles": "yes"
}
_maps/pubbystation.json
+2 -1
View File
@@ -3,5 +3,6 @@
"map_path": "map_files/PubbyStation",
"map_file": "PubbyStation.dmm",
"minetype": "lavaland",
"transition_config": "default"
"transition_config": "default",
"allow_custom_shuttles": "yes"
}
_maps/runtimestation.json
+2 -1
View File
@@ -3,5 +3,6 @@
"map_path": "map_files/debug",
"map_file": "runtimestation.dmm",
"minetype": "lavaland",
"transition_config": "default"
"transition_config": "default",
"allow_custom_shuttles": "no"
}
_maps/shuttles/cargo_birdboat.dmm
+4 -16
View File
@@ -6,16 +6,10 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"c" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"d" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"e" = (
/obj/machinery/conveyor{
@@ -148,10 +142,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/supply)
"t" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"u" = (
/obj/structure/window/reinforced{
@@ -161,10 +152,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/supply)
"v" = (
/turf/closed/wall/shuttle{
icon_state = "swallc4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"w" = (
/turf/open/space,
_maps/shuttles/cargo_box.dmm
+7 -28
View File
@@ -6,16 +6,10 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"c" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"d" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"e" = (
/turf/open/floor/mineral/titanium/blue,
@@ -81,10 +75,7 @@
/turf/open/floor/plating,
/area/shuttle/supply)
"k" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"l" = (
/turf/open/floor/mineral/titanium/blue,
@@ -97,22 +88,13 @@
},
/area/shuttle/supply)
"n" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"o" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"p" = (
/turf/closed/wall/shuttle{
icon_state = "swall15";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"q" = (
/obj/structure/window/reinforced{
@@ -122,10 +104,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/supply)
"r" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"s" = (
/turf/open/space,
_maps/shuttles/emergency_asteroid.dmm
+12 -47
View File
@@ -20,10 +20,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"af" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ag" = (
/turf/open/space,
@@ -53,10 +50,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ak" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"al" = (
/obj/machinery/door/airlock/titanium{
@@ -78,10 +72,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"ao" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ap" = (
/obj/structure/ore_box,
@@ -95,19 +86,13 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"as" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"at" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"au" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"av" = (
/obj/structure/chair{
@@ -125,28 +110,20 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ay" = (
/turf/closed/wall/shuttle{
icon_state = "swall15";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"az" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aA" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aB" = (
/turf/open/floor/mineral/titanium,
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/escape)
"aC" = (
/turf/closed/wall/shuttle{
icon_state = "swall_f11"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aD" = (
/obj/structure/window/shuttle,
@@ -218,10 +195,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aO" = (
/turf/closed/wall/shuttle{
icon_state = "swallc1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aP" = (
/obj/machinery/door/airlock/glass_security{
@@ -367,10 +341,7 @@
/area/shuttle/escape)
"bo" = (
/obj/machinery/status_display,
/turf/closed/wall/shuttle{
icon_state = "swall2";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bp" = (
/obj/machinery/computer/crew,
@@ -450,16 +421,10 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bA" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bB" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bC" = (
/obj/item/device/radio/intercom{
_maps/shuttles/emergency_bar.dmm
+11 -41
View File
@@ -3,17 +3,14 @@
/turf/open/space,
/area/space)
"ab" = (
/turf/closed/wall/mineral/titanium/overspace,
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ae" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
@@ -43,10 +40,7 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"aj" = (
/turf/closed/wall/shuttle{
icon_state = "swallc3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ak" = (
/obj/structure/extinguisher_cabinet{
@@ -117,28 +111,16 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"av" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aw" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ax" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ay" = (
/turf/closed/wall/shuttle{
icon_state = "swall8";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"az" = (
/obj/machinery/door/airlock/glass{
@@ -152,10 +134,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aB" = (
/turf/closed/wall/shuttle{
icon_state = "swall4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair,
@@ -258,10 +237,7 @@
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"aQ" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aR" = (
/obj/structure/table/wood/bar{
@@ -350,10 +326,7 @@
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"bf" = (
/turf/closed/wall/shuttle{
icon_state = "swall1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bg" = (
/obj/machinery/door/airlock/titanium{
@@ -384,10 +357,7 @@
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"bl" = (
/turf/closed/wall/shuttle{
icon_state = "swallc2";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bm" = (
/obj/machinery/door/airlock{
_maps/shuttles/emergency_box.dmm
+9 -36
View File
@@ -10,10 +10,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ae" = (
/turf/open/floor/mineral/titanium,
@@ -110,22 +107,13 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"av" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aw" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ax" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ay" = (
/obj/machinery/door/airlock/glass{
@@ -225,16 +213,10 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aN" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aO" = (
/turf/closed/wall/shuttle{
icon_state = "swallc4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aP" = (
/obj/machinery/door/airlock/titanium{
@@ -306,10 +288,7 @@
/area/shuttle/escape)
"aY" = (
/obj/machinery/status_display,
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aZ" = (
/obj/machinery/door/airlock/glass{
@@ -318,10 +297,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ba" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bb" = (
/turf/open/floor/mineral/titanium/yellow,
@@ -363,10 +339,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bh" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bi" = (
/obj/structure/window/reinforced{
_maps/shuttles/emergency_goon.dmm
+9 -30
View File
@@ -45,20 +45,13 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"i" = (
/turf/closed/wall/shuttle{
icon_state = "wall_space";
dir = 8
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"j" = (
/turf/closed/wall/shuttle{
icon_state = "swall4"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"k" = (
/turf/closed/wall/shuttle{
icon_state = "swall12"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"l" = (
/obj/machinery/vending/wallmed,
@@ -70,9 +63,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"n" = (
/turf/closed/wall/shuttle{
icon_state = "swall1"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"o" = (
/turf/open/floor/mineral/titanium/blue,
@@ -161,14 +152,10 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"C" = (
/turf/closed/wall/shuttle{
icon_state = "swall8"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"D" = (
/turf/closed/wall/shuttle{
icon_state = "swall3"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"E" = (
/obj/machinery/door/airlock/glass{
@@ -227,22 +214,14 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"N" = (
/turf/closed/wall/shuttle{
icon_state = "wall_space";
dir = 4
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"O" = (
/turf/closed/wall/shuttle{
icon_state = "wall_floor";
dir = 8
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"P" = (
/obj/machinery/status_display,
/turf/closed/wall/shuttle{
icon_state = "swall0"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"Q" = (
/obj/machinery/light,
_maps/shuttles/emergency_meta.dmm
+10 -38
View File
@@ -13,10 +13,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ae" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"af" = (
/obj/machinery/door/airlock/titanium{
@@ -42,10 +39,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ai" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aj" = (
/turf/open/space,
@@ -55,10 +49,7 @@
},
/area/shuttle/escape)
"ak" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"al" = (
/obj/structure/table,
@@ -246,9 +237,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aD" = (
/turf/closed/wall/shuttle{
icon_state = "swall1"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair{
@@ -293,9 +282,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aM" = (
/turf/closed/wall/shuttle{
icon_state = "swall2"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aN" = (
/obj/machinery/status_display{
@@ -367,16 +354,10 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aU" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aV" = (
/turf/closed/wall/shuttle{
icon_state = "swall8";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aW" = (
/obj/machinery/door/airlock/command{
@@ -387,10 +368,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aX" = (
/turf/closed/wall/shuttle{
icon_state = "swall15";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aY" = (
/obj/machinery/door/airlock/glass_security{
@@ -419,10 +397,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bc" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bd" = (
/obj/structure/chair{
@@ -502,10 +477,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"br" = (
/turf/closed/wall/shuttle{
icon_state = "swall4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"bs" = (
/obj/structure/chair{
_maps/shuttles/emergency_mini.dmm
+1 -4
View File
@@ -195,10 +195,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"F" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/obj/structure/table,
/obj/item/storage/firstaid/fire,
/obj/item/storage/firstaid/regular{
_maps/shuttles/emergency_supermatter.dmm
+8 -28
View File
@@ -14,10 +14,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"ae" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"af" = (
/turf/closed/wall/mineral/titanium,
@@ -44,9 +41,7 @@
/area/shuttle/escape)
"ak" = (
/obj/structure/sign/radiation,
/turf/closed/wall/shuttle{
icon_state = "swall3"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"al" = (
/obj/machinery/shower{
@@ -121,15 +116,10 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/escape)
"ay" = (
/turf/closed/wall/shuttle{
icon_state = "swall_f5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"az" = (
/turf/closed/wall/shuttle{
icon_state = "swallc1"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aA" = (
/obj/machinery/door/airlock/titanium{
@@ -177,15 +167,11 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aG" = (
/turf/closed/wall/shuttle{
icon_state = "swallc3"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aH" = (
/obj/machinery/status_display,
/turf/closed/wall/shuttle{
icon_state = "swall12"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aI" = (
/obj/structure/sign/radiation,
@@ -193,16 +179,10 @@
/area/shuttle/escape)
"aJ" = (
/obj/structure/sign/radiation,
/turf/closed/wall/shuttle{
icon_state = "swallc2";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aK" = (
/turf/closed/wall/shuttle{
icon_state = "swallc4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aL" = (
/obj/machinery/door/airlock/external{
_maps/shuttles/ferry_base.dmm
+3 -11
View File
@@ -67,16 +67,11 @@
/obj/structure/shuttle/engine/propulsion{
dir = 4
},
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"o" = (
/turf/open/floor/plasteel/shuttle,
/turf/closed/wall/mineral/titanium/interior{
icon_state = "swall_f10"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"p" = (
/obj/structure/closet/crate,
@@ -89,10 +84,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"r" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
(1,1,1) = {"
_maps/shuttles/ferry_lighthouse.dmm
+2 -8
View File
@@ -99,10 +99,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"ax" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"ay" = (
/obj/structure/window/shuttle,
@@ -114,10 +111,7 @@
/turf/open/floor/plating,
/area/shuttle/transport)
"aA" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"aB" = (
/obj/structure/grille{
_maps/shuttles/ferry_meat.dmm
+5 -13
View File
@@ -6,13 +6,13 @@
/obj/structure/shuttle/engine/propulsion{
dir = 4
},
/turf/closed/wall/mineral/titanium/overspace,
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"c" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"d" = (
/turf/closed/wall/mineral/titanium/overspace,
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"e" = (
/turf/open/floor/plasteel/freezer,
@@ -123,16 +123,11 @@
/obj/structure/shuttle/engine/propulsion{
dir = 4
},
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"s" = (
/turf/open/floor/plasteel/freezer,
/turf/closed/wall/mineral/titanium/interior{
icon_state = "swall_f10"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"t" = (
/obj/structure/closet/chefcloset,
@@ -156,10 +151,7 @@
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"x" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
(1,1,1) = {"
_maps/shuttles/whiteship_box.dmm
+12 -44
View File
@@ -6,10 +6,7 @@
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned)
"ac" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ad" = (
/obj/machinery/door/airlock/titanium,
@@ -30,10 +27,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"ae" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"af" = (
/obj/machinery/door/airlock/titanium,
@@ -46,16 +40,10 @@
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
"ah" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ai" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aj" = (
/turf/open/floor/mineral/titanium,
@@ -74,10 +62,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"am" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"an" = (
/obj/structure/shuttle/engine/propulsion{
@@ -99,10 +84,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/abandoned)
"aq" = (
/turf/closed/wall/shuttle{
icon_state = "swall15";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ar" = (
/obj/machinery/computer/pod{
@@ -111,18 +93,13 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"as" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"at" = (
/turf/open/floor/plating,
/area/shuttle/abandoned)
"au" = (
/turf/closed/wall/shuttle{
icon_state = "swall_f13"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"av" = (
/obj/structure/rack,
@@ -150,15 +127,10 @@
/turf/open/floor/plating,
/area/shuttle/abandoned)
"az" = (
/turf/closed/wall/shuttle{
icon_state = "swall_f12"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aA" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aB" = (
/obj/structure/shuttle/engine/propulsion/right{
@@ -181,9 +153,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aF" = (
/turf/closed/wall/shuttle{
icon_state = "swall_f14"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aG" = (
/obj/structure/rack,
@@ -202,9 +172,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aI" = (
/turf/closed/wall/shuttle{
icon_state = "swall_f11"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aJ" = (
/obj/structure/chair{
_maps/shuttles/whiteship_meta.dmm
+17 -66
View File
@@ -9,20 +9,14 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ad" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ae" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"af" = (
/turf/closed/wall/shuttle{
icon_state = "swallc1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ag" = (
/obj/docking_port/mobile{
@@ -58,16 +52,10 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"ai" = (
/turf/closed/wall/shuttle{
icon_state = "swallc2";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aj" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ak" = (
/obj/structure/shuttle/engine/propulsion/left{
@@ -76,16 +64,10 @@
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
"al" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"am" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"an" = (
/obj/structure/toilet{
@@ -122,10 +104,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"ap" = (
/turf/closed/wall/shuttle{
icon_state = "swall3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aq" = (
/obj/structure/closet/wardrobe/mixed,
@@ -195,9 +174,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"av" = (
/turf/closed/wall/shuttle{
icon_state = "swall1"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aw" = (
/obj/structure/sign/vacuum{
@@ -329,16 +306,10 @@
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
"aE" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aF" = (
/turf/closed/wall/shuttle{
icon_state = "swall8";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"aG" = (
/obj/machinery/door/airlock/titanium{
@@ -601,9 +572,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aZ" = (
/turf/closed/wall/shuttle{
icon_state = "swall2"
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"ba" = (
/obj/effect/decal/cleanable/oil,
@@ -645,10 +614,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"be" = (
/turf/closed/wall/shuttle{
icon_state = "swall1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"bf" = (
/obj/machinery/door/airlock/titanium{
@@ -671,16 +637,10 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"bh" = (
/turf/closed/wall/shuttle{
icon_state = "swall4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"bi" = (
/turf/closed/wall/shuttle{
icon_state = "swallc4";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"bj" = (
/obj/machinery/door/airlock/titanium{
@@ -697,10 +657,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"bk" = (
/turf/closed/wall/shuttle{
icon_state = "swallc3";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"bl" = (
/obj/machinery/door/airlock/titanium{
@@ -1180,10 +1137,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"cc" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"cd" = (
/obj/machinery/vending/snack/random,
@@ -1287,10 +1241,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"cp" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"cq" = (
/obj/item/storage/bag/plants/portaseeder,
_maps/templates/small_shuttle_1.dmm
+6 -19
View File
@@ -11,9 +11,7 @@
/area/space)
"d" = (
/turf/open/space,
/turf/closed/wall/shuttle{
icon_state = "swall_f10"
},
/turf/closed/wall/mineral/titanium,
/area/space)
"e" = (
/turf/closed/wall/mineral/titanium,
@@ -28,23 +26,17 @@
/turf/open/floor/mineral/titanium/blue,
/area/space)
"h" = (
/turf/closed/wall/shuttle{
icon_state = "swall13"
},
/turf/closed/wall/mineral/titanium,
/area/space)
"i" = (
/turf/closed/wall/shuttle{
icon_state = "swall8"
},
/turf/closed/wall/mineral/titanium,
/area/space)
"j" = (
/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/space)
"k" = (
/turf/closed/wall/shuttle{
icon_state = "swall4"
},
/turf/closed/wall/mineral/titanium,
/area/space)
"l" = (
/obj/structure/chair{
@@ -64,9 +56,7 @@
/area/space)
"o" = (
/turf/open/space,
/turf/closed/wall/shuttle{
icon_state = "swall_f5"
},
/turf/closed/wall/mineral/titanium,
/area/space)
"p" = (
/obj/structure/shuttle/engine/propulsion/left,
@@ -81,10 +71,7 @@
/turf/open/floor/plating/airless,
/area/space)
"s" = (
/turf/open/space,
/turf/closed/wall/shuttle{
icon_state = "swall_f9"
},
/turf/closed/wall/mineral/titanium,
/area/space)
(1,1,1) = {"
code/__DEFINES/logging.dm.rej
-9
View File
@@ -1,9 +0,0 @@
diff a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm (rejected hunks)
@@ -9,6 +9,7 @@
#define INVESTIGATE_SUPERMATTER "supermatter"
#define INVESTIGATE_TELESCI "telesci"
#define INVESTIGATE_WIRES "wires"
+#define INVESTIGATE_HALLUCINATIONS "hallucinations"
//Individual logging defines
#define INDIVIDUAL_ATTACK_LOG "Attack log"
code/__HELPERS/_logging.dm
+1 -2
View File
@@ -97,8 +97,7 @@
WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]CHAT: [text]")
/proc/log_sql(text)
if(config.sql_enabled)
WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]SQL: [text]")
WRITE_FILE(GLOB.sql_error_log, "\[[time_stamp()]]SQL: [text]")
//This replaces world.log so it displays both in DD and the file
/proc/log_world(text)
code/__HELPERS/icon_smoothing.dm
+1 -1
View File
@@ -20,7 +20,7 @@
A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is
not set properly, the underlay will default to regular floor plating.
To see an example of a diagonal wall, see '/turf/closed/wall/shuttle' and its subtypes.
To see an example of a diagonal wall, see '/turf/closed/wall/mineral/titanium' and its subtypes.
*/
//Redefinitions of the diagonal directions so they can be stored in one var without conflicts
code/__HELPERS/type2type.dm
+4 -2
View File
@@ -72,7 +72,9 @@
return .
//Splits the text of a file at seperator and returns them in a list.
/world/proc/file2list(filename, seperator="\n")
/world/proc/file2list(filename, seperator="\n", trim = TRUE)
if (trim)
return splittext(trim(file2text(filename)),seperator)
return splittext(file2text(filename),seperator)
//Turns a direction into text
@@ -551,4 +553,4 @@
return /atom
else
return /datum
return text2path(copytext(string_type, 1, last_slash))
return text2path(copytext(string_type, 1, last_slash))
code/_globalvars/lists/poll_ignore.dm
+1
View File
@@ -6,5 +6,6 @@
#define POLL_IGNORE_ALIEN_LARVA "alien_larva"
#define POLL_IGNORE_CLOCKWORK_MARAUDER "clockwork_marauder"
#define POLL_IGNORE_SYNDICATE "syndicate"
#define POLL_IGNORE_HOLOPARASITE "holoparasite"
GLOBAL_LIST_EMPTY(poll_ignore)
code/_globalvars/logging.dm
+2
View File
@@ -12,6 +12,8 @@ GLOBAL_VAR(round_id)
GLOBAL_PROTECT(round_id)
GLOBAL_VAR(config_error_log)
GLOBAL_PROTECT(config_error_log)
GLOBAL_VAR(sql_error_log)
GLOBAL_PROTECT(sql_error_log)
GLOBAL_LIST_EMPTY(bombers)
GLOBAL_PROTECT(bombers)
code/datums/antagonists/devil.dm
+2 -2
View File
@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
if(form == BLOOD_LIZARD && SOULVALUE < BLOOD_THRESHOLD)
regress_humanoid()
if(SOULVALUE < 0)
remove_spells()
give_appropriate_spells()
to_chat(owner.current, "<span class='warning'>As punishment for your failures, all of your powers except contract creation have been revoked.")
/datum/antagonist/devil/proc/regress_humanoid()
@@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
reviveNumber += LOSS_PER_DEATH
update_hud()
if(body)
body.revive(1,0)
body.revive(TRUE, TRUE) //Adminrevive also recovers organs, preventing someone from resurrecting without a heart.
if(istype(body.loc, /obj/effect/dummy/slaughter/))
body.forceMove(get_turf(body))//Fixes dying while jaunted leaving you permajaunted.
if(istype(body, /mob/living/carbon/true_devil))
code/datums/callback.dm.rej
-62
View File
@@ -1,62 +0,0 @@
diff a/code/datums/callback.dm b/code/datums/callback.dm (rejected hunks)
@@ -100,60 +100,3 @@
if (object == GLOBAL_PROC)
return call(delegate)(arglist(calling_arguments))
return call(object, delegate)(arglist(calling_arguments))
-
-
-/datum/callback_select
- var/list/finished
- var/pendingcount
- var/total
-
-/datum/callback_select/New(count, savereturns)
- total = count
- if (savereturns)
- finished = new(count)
-
-
-/datum/callback_select/proc/invoke_callback(index, datum/callback/callback, list/callback_args, savereturn = TRUE)
- set waitfor = FALSE
- if (!callback || !istype(callback))
- //This check only exists because the alternative is callback_select would block forever if given invalid data
- CRASH("invalid callback passed to invoke_callback")
- if (!length(callback_args))
- callback_args = list()
- pendingcount++
- debug_usr("calling callback")
- var/rtn = callback.Invoke(arglist(callback_args))
- debug_usr("callback returned")
- pendingcount--
- if (savereturn)
- finished[index] = rtn
-
-
-
-
-//runs a list of callbacks asynchronously, returning once all of them return.
-//callbacks can be repeated.
-//callbacks-args is a optional list of argument lists, in the same order as the callbacks,
-// the inner lists will be sent to the callbacks when invoked() as additional args.
-//can optionly save and return a list of return values, in the same order as the original list of callbacks
-//resolution is the number of byond ticks between checks.
-/proc/callback_select(list/callbacks, list/callback_args, savereturns = TRUE, resolution = 1)
- if (!callbacks)
- return
- var/count = length(callbacks)
- if (!count)
- return
- if (!callback_args)
- callback_args = list()
-
- callback_args.len = count
-
- var/datum/callback_select/CS = new(count, savereturns)
- for (var/i in 1 to count)
- CS.invoke_callback(i, callbacks[i], callback_args[i], savereturns)
- debug_usr("starting callbacks: [CS.pendingcount]")
- while(CS.pendingcount)
- debug_usr("callbacks: [CS.pendingcount]")
- sleep(resolution*world.tick_lag)
- return CS.finished
-
code/datums/components/README.md
+1 -1
View File
@@ -56,7 +56,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)`
* Shorthand for `var/component_type/varname = src.GetComponent(component_type)`
1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component` (public, final)
* Creates an instance of `component_type` in the datum and passes `...` to it's `New()` call
* Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call
* Sends the `COMSIG_COMPONENT_ADDED` signal to the datum
* All components a datum owns are deleted with the datum
* Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set
code/datums/components/component.dm.rej
-1
View File
@@ -1 +0,0 @@
-
code/datums/map_config.dm
+8 -6
View File
@@ -27,7 +27,7 @@
var/config_max_users = 0
var/config_min_users = 0
var/voteweight = 1
var/allow_custom_shuttles = "yes"
/datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after)
if(default_to_box)
return
@@ -44,12 +44,12 @@
if(!json)
log_world("Could not open map_config: [filename]")
return
json = file2text(json)
if(!json)
log_world("map_config is not text: [filename]")
return
json = json_decode(json)
if(!json)
log_world("map_config is not json: [filename]")
@@ -58,7 +58,7 @@
if(!ValidateJSON(json))
log_world("map_config failed to validate for above reason: [filename]")
return
config_filename = filename
map_name = json["map_name"]
@@ -66,6 +66,7 @@
map_file = json["map_file"]
minetype = json["minetype"]
allow_custom_shuttles = json["allow_custom_shuttles"]
var/list/jtcl = json["transition_config"]
@@ -74,7 +75,7 @@
for(var/I in jtcl)
transition_config[TransitionStringToEnum(I)] = TransitionStringToEnum(jtcl[I])
defaulted = FALSE
#define CHECK_EXISTS(X) if(!istext(json[X])) { log_world(X + "missing from json!"); return; }
@@ -84,6 +85,7 @@
CHECK_EXISTS("map_file")
CHECK_EXISTS("minetype")
CHECK_EXISTS("transition_config")
CHECK_EXISTS("allow_custom_shuttles")
var/path = GetFullMapPath(json["map_path"], json["map_file"])
if(!fexists(path))
@@ -92,7 +94,7 @@
if(json["transition_config"] != "default")
if(!islist(json["transition_config"]))
log_world("transition_config is not a list!")
log_world("transition_config is not a list!")
return
var/list/jtcl = json["transition_config"]
code/datums/riding.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/datums/riding.dm b/code/datums/riding.dm (rejected hunks)
@@ -419,7 +419,7 @@
icon = 'icons/obj/items_and_weapons.dmi.dmi'
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
- flags = ABSTRACT | DROPDEL | NOBLUDGEON
+ flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/mob/living/carbon/rider
var/mob/living/ridden
code/game/area/Space_Station_13_areas.dm.rej
-29
View File
@@ -1,29 +0,0 @@
diff a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm (rejected hunks)
@@ -535,15 +535,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/toilet/fitness
name = "Fitness Toilets"
icon_state = "toilet"
-
+
/area/crew_quarters/toilet/female
name = "Female Toilets"
icon_state = "toilet"
-
+
/area/crew_quarters/toilet/male
name = "Male Toilets"
icon_state = "toilet"
-
+
/area/crew_quarters/toilet/restrooms
name = "Restrooms"
icon_state = "toilet"
@@ -1009,7 +1009,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/execution/transfer
name = "Transfer Centre"
-
+
/area/security/execution/education
name = "Prisoner Education Chamber"
code/game/area/areas.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/area/areas.dm b/code/game/area/areas.dm (rejected hunks)
@@ -432,7 +432,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
// Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
if(L.client && !L.client.ambience_playing && L.client.prefs.toggles & SOUND_SHIP_AMBIENCE)
L.client.ambience_playing = 1
- L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ)
+ SEND_SOUND(L, sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ))
if(!(L.client && (L.client.prefs.toggles & SOUND_AMBIENCE)))
return //General ambience check is below the ship ambience so one can play without the other
code/game/gamemodes/blob/powers.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm (rejected hunks)
@@ -175,7 +175,7 @@
SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg'))
to_chat(blobber, "<b>You are a blobbernaut!</b>")
to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.")
- to_chat(blobber, "You can communicate with other blobbernauts and GLOB.overminds via <b>:b</b>")
+ to_chat(blobber, "You can communicate with other blobbernauts and overminds via <b>:b</b>")
to_chat(blobber, "Your overmind's blob reagent is: <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font>!")
to_chat(blobber, "The <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font> reagent [blob_reagent_datum.shortdesc ? "[blob_reagent_datum.shortdesc]" : "[blob_reagent_datum.description]"]")
if(blobber)
code/game/gamemodes/changeling/powers/mutations.dm.rej
-19
View File
@@ -1,19 +0,0 @@
diff a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm (rejected hunks)
@@ -395,7 +395,7 @@
/obj/item/shield/changeling
name = "shield-like mass"
desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield."
- flags = ABSTRACT | NODROP | DROPDEL
+ flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "ling_shield"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
@@ -443,7 +443,7 @@
name = "flesh mass"
icon_state = "lingspacesuit"
desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
- flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
+ flags_1 = STOPSPRESSUREDMAGE_1 | NODROP_1 | DROPDEL_1 //Not THICKMATERIAL_1 because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90) //No armor at all.
code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
-3
View File
@@ -27,9 +27,6 @@
/turf/closed/wall/mineral/cult/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //no metal
return list("operation_time" = 80, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = SOUTH)
/turf/closed/wall/shuttle/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal
return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH)
/turf/closed/wall/r_wall/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)
return FALSE
code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm b/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm (rejected hunks)
@@ -6,6 +6,8 @@
icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "ratvarian_spear"
item_state = "ratvarian_spear"
+ lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
force = 15 //Extra damage is dealt to targets in attack()
throwforce = 25
armour_penetration = 10
code/game/gamemodes/cult/cult_items.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm (rejected hunks)
@@ -31,7 +31,7 @@
/obj/item/melee/cultblade/ghost
name = "eldritch sword"
force = 19 //can't break normal airlocks
- flags = NODROP|DROPDEL
+ flags_1 = NODROP_1|DROPDEL_1
/obj/item/melee/cultblade/pickup(mob/living/user)
..()
code/game/gamemodes/cult/talisman.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm (rejected hunks)
@@ -343,7 +343,7 @@
desc = "Shackles that bind the wrists with sinister magic."
trashtype = /obj/item/restraints/handcuffs/energy/used
origin_tech = "materials=2;magnets=5"
- flags = DROPDEL
+ flags_1 = DROPDEL_1
/obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user)
user.visible_message("<span class='danger'>[user]'s shackles shatter in a discharge of dark magic!</span>", \
code/game/gamemodes/gang/gang_items.dm
+1 -1
View File
@@ -431,7 +431,7 @@
/datum/gang_item/equipment/dominator/purchase(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool)
var/area/usrarea = get_area(user.loc)
var/usrturf = get_turf(user.loc)
if(initial(usrarea.name) == "Space" || isspaceturf(usrturf) || usr.z != ZLEVEL_STATION)
if(initial(usrarea.name) == "Space" || isspaceturf(usrturf) || usr.z != ZLEVEL_STATION || !usrarea.valid_territory)
to_chat(user, "<span class='warning'>You can only use this on the station!</span>")
return FALSE
code/game/gamemodes/miniantags/abduction/abduction_gear.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm (rejected hunks)
@@ -499,7 +499,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
/obj/item/restraints/handcuffs/energy/used
desc = "energy discharge"
- flags = DROPDEL
+ flags_1 = DROPDEL_1
/obj/item/restraints/handcuffs/energy/used/dropped(mob/user)
user.visible_message("<span class='danger'>[user]'s [src] break in a discharge of energy!</span>", \
code/game/gamemodes/miniantags/abduction/abduction_outfits.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm (rejected hunks)
@@ -23,7 +23,7 @@
var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H
if(V)
console.AddVest(V)
- V.flags |= NODROP
+ V.flags_1 |= NODROP_1
var/obj/item/storage/backpack/B = locate() in H
if(B)
code/game/machinery/computer/buildandrepair.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm (rejected hunks)
@@ -136,7 +136,7 @@
/obj/structure/frame/computer/deconstruct(disassembled = TRUE)
- if(!(flags & NODECONSTRUCT))
+ if(!(flags_1 & NODECONSTRUCT_1))
if(state == 4)
new /obj/item/shard(loc)
new /obj/item/shard(loc)
code/game/machinery/computer/communications.dm
+2 -1
View File
@@ -456,7 +456,8 @@
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=announce'>Make a Captain's Announcement</A> \]"
if(config.cross_allowed)
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=crossserver'>Send a message to an allied station</A> \]"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=purchase_menu'>Purchase Shuttle</A> \]"
if(SSmapping.config.allow_custom_shuttles == "yes")
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=purchase_menu'>Purchase Shuttle</A> \]"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=changeseclevel'>Change Alert Level</A> \]"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
code/game/machinery/doors/door.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm (rejected hunks)
@@ -163,7 +163,7 @@
else if(istype(I, /obj/item/weldingtool))
try_to_weld(I, user)
return 1
- else if(!(I.flags & NOBLUDGEON) && user.a_intent != INTENT_HARM)
+ else if(!(I.flags_1 & NOBLUDGEON_1) && user.a_intent != INTENT_HARM)
try_to_activate_door(user)
return 1
return ..()
code/game/machinery/doors/windowdoor.dm.rej
-19
View File
@@ -1,19 +0,0 @@
diff a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm (rejected hunks)
@@ -11,7 +11,7 @@
integrity_failure = 0
armor = list(melee = 20, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 70, acid = 100)
visible = FALSE
- flags = ON_BORDER
+ flags_1 = ON_BORDER_1
opacity = 0
CanAtmosPass = ATMOS_PASS_PROC
var/obj/item/electronics/airlock/electronics = null
@@ -221,7 +221,7 @@
return
add_fingerprint(user)
- if(!(flags&NODECONSTRUCT))
+ if(!(flags_1&NODECONSTRUCT_1))
if(istype(I, /obj/item/screwdriver))
if(density || operating)
to_chat(user, "<span class='warning'>You need to open the door to access the maintenance panel!</span>")
code/game/machinery/firealarm.dm.rej
-16
View File
@@ -1,16 +0,0 @@
diff a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm (rejected hunks)
@@ -239,12 +239,12 @@
alarm()
/obj/machinery/firealarm/obj_break(damage_flag)
- if(!(stat & BROKEN) && !(flags & NODECONSTRUCT) && buildstage != 0) //can't break the electronics if there isn't any inside.
+ if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside.
stat |= BROKEN
update_icon()
/obj/machinery/firealarm/deconstruct(disassembled = TRUE)
- if(!(flags & NODECONSTRUCT))
+ if(!(flags_1 & NODECONSTRUCT_1))
new /obj/item/stack/sheet/metal(loc, 1)
if(!(stat & BROKEN))
var/obj/item/I = new /obj/item/electronics/firealarm(loc)
code/game/machinery/iv_drip.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm (rejected hunks)
@@ -15,7 +15,7 @@
/obj/item/reagent_containers/glass)
/obj/machinery/iv_drip/Initialize()
- ..()
+ . = ..()
update_icon()
drip_containers = typecacheof(drip_containers)
code/game/machinery/limbgrower.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm (rejected hunks)
@@ -10,7 +10,7 @@
icon = 'icons/obj/machines/limbgrower.dmi'
icon_state = "limbgrower_idleoff"
density = TRUE
- container_type = OPENCONTAINER
+ container_type = OPENCONTAINER_1
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 10
code/game/machinery/newscaster.dm.rej
-18
View File
@@ -1,18 +0,0 @@
diff a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm (rejected hunks)
@@ -758,14 +758,14 @@ GLOBAL_LIST_EMPTY(allCasters)
/obj/machinery/newscaster/deconstruct(disassembled = TRUE)
- if(!(flags & NODECONSTRUCT))
+ if(!(flags_1 & NODECONSTRUCT_1))
new /obj/item/stack/sheet/metal(loc, 2)
new /obj/item/shard(loc)
new /obj/item/shard(loc)
qdel(src)
/obj/machinery/newscaster/obj_break()
- if(!(stat & BROKEN) && !(flags & NODECONSTRUCT))
+ if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN
playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1)
update_icon()
code/game/machinery/porta_turret/portable_turret.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm (rejected hunks)
@@ -664,7 +659,7 @@
return ..()
/obj/machinery/turretid/Initialize(mapload) //map-placed turrets autolink turrets
- ..()
+ . = ..()
if(!mapload)
return
code/game/machinery/recycler.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm (rejected hunks)
@@ -187,7 +187,7 @@
name = "dangerous old crusher"
emagged = TRUE
crush_damage = 120
- flags = NODECONSTRUCT
+ flags_1 = NODECONSTRUCT_1
/obj/item/paper/guides/recycler
name = "paper - 'garbage duty instructions'"
code/game/machinery/shieldgen.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm (rejected hunks)
@@ -12,7 +12,7 @@
/obj/structure/emergency_shield/Initialize()
. = ..()
- setDir(pick(1,2,3,4))
+ setDir(pick(GLOB.cardinals))
air_update_turf(1)
/obj/structure/emergency_shield/Destroy()
code/game/machinery/telecomms/machines/allinone.dm
+12 -3
View File
@@ -12,7 +12,7 @@
use_power = NO_POWER_USE
idle_power_usage = 0
machinetype = 6
var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel
var/intercept = FALSE // if TRUE, broadcasts all (non-syndie) messages to syndicate channel
/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal)
@@ -33,12 +33,21 @@
sleep(signal.data["slow"]) // simulate the network lag if necessary
/* ###### Broadcast a message using signal.data ###### */
if(signal.frequency == GLOB.SYND_FREQ) // if syndicate broadcast, just
Broadcast_Message(signal.data["mob"],
signal.data["vmask"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"],
signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"],
signal.data["language"])
/* ###### Copy all non-syndie communications to the Syndicate Frequency ###### */
if(intercept && signal.frequency != GLOB.SYND_FREQ)
Broadcast_Message(signal.data["mob"],
signal.data["vmask"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"],
signal.data["realname"],, signal.data["compression"], list(0, z), GLOB.SYND_FREQ, signal.data["spans"],
signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"],
signal.data["language"])
code/game/objects/effects/mines.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm (rejected hunks)
@@ -130,7 +130,7 @@
new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0)
var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
- chainsaw.flags |= NODROP
+ chainsaw.flags_1 |= NODROP_1
victim.drop_all_held_items()
victim.put_in_hands(chainsaw)
chainsaw.attack_self(victim)
code/game/objects/items.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/items.dm b/code/game/objects/items.dm (rejected hunks)
@@ -135,7 +135,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
hitsound = "swing_hit"
/obj/item/Destroy()
- flags &= ~DROPDEL //prevent reqdels
+ flags_1 &= ~DROPDEL_1 //prevent reqdels
if(ismob(loc))
var/mob/m = loc
m.temporarilyRemoveItemFromInventory(src, TRUE)
code/game/objects/items/devices/radio/radio.dm
+4 -1
View File
@@ -426,7 +426,10 @@
signal.frequency = freqnum // Quick frequency set
for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list)
R.receive_signal(signal)
// Allinone can act as receivers. (Unless of course whoever coded this last time forgot to put it in somewhere!)
for(var/obj/machinery/telecomms/allinone/R in GLOB.telecomms_list)
R.receive_signal(signal)
spawn(20) // wait a little...
code/game/objects/items/implants/implant_explosive.dm
+1 -1
View File
@@ -44,7 +44,7 @@
active = TRUE
var/turf/boomturf = get_turf(imp_in)
var/area/A = get_area(boomturf)
message_admins("[ADMIN_LOOKUPFLW(imp_in)] has activated their [name] at [A.name] [ADMIN_JMP(boomturf)].")
message_admins("[ADMIN_LOOKUPFLW(imp_in)] has activated their [name] at [A.name] [ADMIN_JMP(boomturf)], with cause of [cause].")
//If the delay is short, just blow up already jeez
if(delay <= 7)
explosion(src,heavy,medium,weak,weak, flame_range = weak)
code/game/objects/items/robot/robot_items.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm (rejected hunks)
@@ -151,7 +151,7 @@
/obj/item/borg/charger
name = "power connector"
icon_state = "charger_draw"
- flags = NOBLUDGEON
+ flags_1 = NOBLUDGEON_1
var/mode = "draw"
var/static/list/charge_machines = typecacheof(list(/obj/machinery/cell_charger, /obj/machinery/recharger, /obj/machinery/recharge_station, /obj/machinery/mech_bay_recharge_port))
var/static/list/charge_items = typecacheof(list(/obj/item/stock_parts/cell, /obj/item/gun/energy))
code/game/objects/items/stacks/wrap.dm.rej
-19
View File
@@ -1,19 +0,0 @@
diff a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm (rejected hunks)
@@ -9,7 +9,7 @@
desc = "Wrap packages with this festive paper to make gifts."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "wrap_paper"
- flags = NOBLUDGEON
+ flags_1 = NOBLUDGEON_1
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
@@ -30,7 +30,7 @@
desc = "You can use this to wrap items in."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "deliveryPaper"
- flags = NOBLUDGEON
+ flags_1 = NOBLUDGEON_1
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
code/game/objects/items/storage/boxes.dm
+892 -893
View File
File diff suppressed because it is too large Load Diff
code/game/objects/items/storage/boxes.dm.rej
+9
View File
@@ -0,0 +1,9 @@
diff a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm (rejected hunks)
@@ -732,7 +732,6 @@
/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
name = "ingredients box"
illustration = "donk_kit"
- icon_state = null
/obj/item/storage/box/ingredients/Initialize()
..()
code/game/objects/items/toys.dm.rej
-12
View File
@@ -1,12 +0,0 @@
diff a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm (rejected hunks)
@@ -244,8 +244,8 @@
// Copied from /obj/item/melee/transforming/energy/sword/attackby
/obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/toy/sword))
- if((W.flags & NODROP) || (flags & NODROP))
- to_chat(user, "<span class='warning'>\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!</span>")
+ if((W.flags_1 & NODROP_1) || (flags_1 & NODROP_1))
+ to_chat(user, "<span class='warning'>\the [flags_1 & NODROP_1 ? src : W] is stuck to your hand, you can't attach it to \the [flags_1 & NODROP_1 ? W : src]!</span>")
return
else
to_chat(user, "<span class='notice'>You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.</span>")
code/game/objects/items/weaponry.dm
+6 -3
View File
@@ -18,8 +18,11 @@
return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
/obj/item/banhammer/attack(mob/M, mob/user)
to_chat(M, "<font color='red'><b> You have been banned FOR NO REISIN by [user]<b></font>")
to_chat(user, "<font color='red'>You have <b>BANNED</b> [M]</font>")
if(user.zone_selected == "head")
M.visible_message("<span class='danger'>[user] are stroking the head of [M] with a bangammer</span>", "<span class='userdanger'>[user] are stroking the head with a bangammer</span>", "you hear a bangammer stroking a head");
else
M.visible_message("<span class='danger'>[M] has been banned FOR NO REISIN by [user]</span>", "<span class='userdanger'>You have been banned FOR NO REISIN by [user]</span>", "you hear a banhammer banning someone")
playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
/obj/item/sord
@@ -586,4 +589,4 @@
/obj/item/proc/can_trigger_gun(mob/living/user)
if(!user.can_use_guns(src))
return FALSE
return TRUE
return TRUE
code/game/objects/structures/beds_chairs/bed.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm (rejected hunks)
@@ -31,7 +31,7 @@
return attack_hand(user)
/obj/structure/bed/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
+ if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
playsound(src.loc, W.usesound, 50, 1)
deconstruct(TRUE)
else
code/game/objects/structures/beds_chairs/chair.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm (rejected hunks)
@@ -41,7 +41,7 @@
qdel(src)
/obj/structure/chair/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
+ if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
playsound(src.loc, W.usesound, 50, 1)
deconstruct()
else if(istype(W, /obj/item/assembly/shock_kit))
code/game/objects/structures/crates_lockers/closets.dm.rej
-16
View File
@@ -1,16 +0,0 @@
diff a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm (rejected hunks)
@@ -193,12 +193,12 @@
return open(user)
/obj/structure/closet/deconstruct(disassembled = TRUE)
- if(ispath(material_drop) && material_drop_amount && !(flags & NODECONSTRUCT))
+ if(ispath(material_drop) && material_drop_amount && !(flags_1 & NODECONSTRUCT_1))
new material_drop(loc, material_drop_amount)
qdel(src)
/obj/structure/closet/obj_break(damage_flag)
- if(!broken && !(flags & NODECONSTRUCT))
+ if(!broken && !(flags_1 & NODECONSTRUCT_1))
bust_open()
/obj/structure/closet/attackby(obj/item/W, mob/user, params)
code/game/objects/structures/displaycase.dm.rej
-19
View File
@@ -1,19 +0,0 @@
diff a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm (rejected hunks)
@@ -50,7 +50,7 @@
playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
/obj/structure/displaycase/deconstruct(disassembled = TRUE)
- if(!(flags & NODECONSTRUCT))
+ if(!(flags_1 & NODECONSTRUCT_1))
dump()
if(!disassembled)
new /obj/item/shard( src.loc )
@@ -58,7 +58,7 @@
qdel(src)
/obj/structure/displaycase/obj_break(damage_flag)
- if(!broken && !(flags & NODECONSTRUCT))
+ if(!broken && !(flags_1 & NODECONSTRUCT_1))
density = FALSE
broken = 1
new /obj/item/shard( src.loc )
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -303,7 +303,7 @@
mineral = /obj/item/stack/sheet/mineral/titanium
walltype = /turf/closed/wall/mineral/titanium
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock/, /turf/closed/wall/shuttle, /obj/structure/window/shuttle, /obj/structure/shuttle/engine, /obj/structure/shuttle/engine/heater, )
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater)
/obj/structure/falsewall/plastitanium
name = "wall"
code/game/objects/structures/fireaxe.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm (rejected hunks)
@@ -91,7 +91,7 @@
new /obj/item/shard(loc)
/obj/structure/fireaxecabinet/deconstruct(disassembled = TRUE)
- if(!(flags & NODECONSTRUCT))
+ if(!(flags_1 & NODECONSTRUCT_1))
if(fireaxe && loc)
fireaxe.forceMove(loc)
fireaxe = null
code/game/objects/structures/flora.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm (rejected hunks)
@@ -13,7 +13,7 @@
var/log_amount = 10
/obj/structure/flora/tree/attackby(obj/item/W, mob/user, params)
- if(!cut && log_amount && (!(NODECONSTRUCT in flags)))
+ if(!cut && log_amount && (!(flags_1 & NODECONSTRUCT_1)))
if(W.sharpness && W.force > 0)
if(W.hitsound)
playsound(get_turf(src), W.hitsound, 100, 0, 0)
code/game/objects/structures/janicart.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm (rejected hunks)
@@ -5,7 +5,7 @@
icon_state = "cart"
anchored = FALSE
density = TRUE
- container_type = OPENCONTAINER
+ container_type = OPENCONTAINER_1
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/obj/item/storage/bag/trash/mybag = null
code/game/objects/structures/manned_turret.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm (rejected hunks)
@@ -177,7 +177,7 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
- flags = ABSTRACT | NODROP | NOBLUDGEON | DROPDEL
+ flags_1 = ABSTRACT_1 | NODROP_1 | NOBLUDGEON_1 | DROPDEL_1
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/obj/machinery/manned_turret/turret
code/game/objects/structures/mirror.dm.rej
-18
View File
@@ -1,18 +0,0 @@
diff a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm (rejected hunks)
@@ -47,14 +47,14 @@
..()
/obj/structure/mirror/obj_break(damage_flag)
- if(!broken && !(flags & NODECONSTRUCT))
+ if(!broken && !(flags_1 & NODECONSTRUCT_1))
icon_state = "mirror_broke"
playsound(src, "shatter", 70, 1)
desc = "Oh no, seven years of bad luck!"
broken = 1
/obj/structure/mirror/deconstruct(disassembled = TRUE)
- if(!(flags & NODECONSTRUCT))
+ if(!(flags_1 & NODECONSTRUCT_1))
if(!disassembled)
new /obj/item/shard( src.loc )
qdel(src)
code/game/objects/structures/signs.dm.rej
-11
View File
@@ -1,11 +0,0 @@
diff a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm (rejected hunks)
@@ -326,6 +326,6 @@
icon_state = "direction_bridge"
/obj/structure/sign/logo
- name = "station logo"
- desc = "A sign: SPACE STATION 13."
+ name = "nanotrasen logo"
+ desc = "The Nanotrasen corporate logo."
icon_state = "nanotrasen_sign1"
\ No newline at end of file
code/game/objects/structures/tables_racks.dm.rej
-37
View File
@@ -1,37 +0,0 @@
diff a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm (rejected hunks)
@@ -94,7 +94,7 @@
/obj/structure/table/attackby(obj/item/I, mob/user, params)
- if(!(flags & NODECONSTRUCT))
+ if(!(flags_1 & NODECONSTRUCT_1))
if(istype(I, /obj/item/screwdriver) && deconstruction_ready)
to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
playsound(src.loc, I.usesound, 50, 1)
@@ -429,7 +429,7 @@
/obj/structure/rack/attackby(obj/item/W, mob/user, params)
- if (istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
+ if (istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
playsound(src.loc, W.usesound, 50, 1)
deconstruct(TRUE)
return
@@ -466,7 +466,7 @@
*/
/obj/structure/rack/deconstruct(disassembled = TRUE)
- if(!(flags&NODECONSTRUCT))
+ if(!(flags_1&NODECONSTRUCT_1))
density = FALSE
var/obj/item/rack_parts/newparts = new(loc)
transfer_fingerprints_to(newparts)
@@ -482,7 +482,7 @@
desc = "Parts of a rack."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "rack_parts"
- flags = CONDUCT
+ flags_1 = CONDUCT_1
materials = list(MAT_METAL=2000)
var/building = FALSE
code/game/objects/structures/watercloset.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm (rejected hunks)
@@ -462,7 +462,7 @@
if(istype(O, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RG = O
- if(RG.container_type & OPENCONTAINER)
+ if(RG.container_type & OPENCONTAINER_1)
if(!RG.reagents.holder_full())
RG.reagents.add_reagent("[dispensedreagent]", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
to_chat(user, "<span class='notice'>You fill [RG] from [src].</span>")
code/game/objects/structures/window.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm (rejected hunks)
@@ -188,7 +188,7 @@
to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
return
- if(!(flags&NODECONSTRUCT))
+ if(!(flags_1&NODECONSTRUCT_1))
if(istype(I, /obj/item/screwdriver))
playsound(src, I.usesound, 75, 1)
if(reinf)
code/game/sound.dm.rej
-9
View File
@@ -1,9 +0,0 @@
diff a/code/game/sound.dm b/code/game/sound.dm (rejected hunks)
@@ -145,7 +145,3 @@
if ("can_open")
soundin = pick('sound/effects/can_open1.ogg', 'sound/effects/can_open2.ogg', 'sound/effects/can_open3.ogg')
return soundin
-
-/proc/playsound_global(file, repeat = 0, wait, channel, volume)
- for(var/V in GLOB.clients)
- V << sound(file, repeat, wait, channel, volume)
code/game/turfs/simulated/dirtystation.dm
+44 -11
View File
@@ -24,16 +24,30 @@
//The code below here isn't exactly optimal, but because of the individual decals that each area uses it's still applicable.
//high dirt - 1/3
if(istype(A, /area/science/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/ruin/space))
//high dirt - 1/3 chance.
var/static/list/high_dirt_areas = typecacheof(list(/area/science/test_area,
/area/mine/production,
/area/mine/living_quarters,
/area/mine/north_outpost,
/area/mine/west_outpost,
/area/ruin/space))
if(is_type_in_typecache(A, high_dirt_areas))
new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works
return
if(prob(80)) //mid dirt - 1/15
return
if(istype(A, /area/engine) || istype(A, /area/crew_quarters/heads/chief) || istype(A, /area/ruin/space/derelict/assembly_line) || istype(A, /area/science/robotics) || istype(A, /area/maintenance) || istype(A, /area/construction))
//Blood, sweat, and oil. Oh, and dirt.
//Construction zones. Blood, sweat, and oil. Oh, and dirt.
var/static/list/engine_dirt_areas = typecacheof(list(/area/engine,
/area/crew_quarters/heads/chief,
/area/ruin/space/derelict/assembly_line,
/area/science/robotics,
/area/maintenance,
/area/construction,
/area/survivalpod))
if(is_type_in_typecache(A, engine_dirt_areas))
if(prob(3))
new /obj/effect/decal/cleanable/blood/old(src)
else
@@ -46,7 +60,10 @@
new /obj/effect/decal/cleanable/dirt(src)
return
if(istype(A, /area/crew_quarters/toilet))
//Bathrooms. Blood, vomit, and shavings in the sinks.
var/static/list/bathroom_dirt_areas = typecacheof(list( /area/crew_quarters/toilet,
/area/awaymission/research/interior/bathroom))
if(is_type_in_typecache(A, bathroom_dirt_areas))
if(prob(40))
if(prob(90))
new /obj/effect/decal/cleanable/vomit/old(src)
@@ -54,15 +71,23 @@
new /obj/effect/decal/cleanable/blood/old(src)
return
if(istype(A, /area/quartermaster))
//Hangars and pods covered in oil.
var/static/list/oily_areas = typecacheof(list(/area/quartermaster))
if(is_type_in_typecache(A, oily_areas))
if(prob(25))
new /obj/effect/decal/cleanable/oil(src)
return
if(prob(75)) //low dirt - 1/60
return
if(istype(A, /area/ai_monitored/turret_protected) || istype(A, /area/prison) || istype(A, /area/security) || istype(A, /area/crew_quarters/heads/hos)) //chance of incident
//Areas where gibs will be present. Robusting probably happened some time ago.
var/static/list/gib_covered_areas = typecacheof(list(/area/ai_monitored/turret_protected,
/area/prison,
/area/security,
/area/crew_quarters/heads/hos))
if(is_type_in_typecache(A, gib_covered_areas))
if(prob(20))
if(prob(5))
new /obj/effect/decal/cleanable/blood/gibs/old(src)
@@ -70,8 +95,10 @@
new /obj/effect/decal/cleanable/blood/old(src)
return
if(istype(A, /area/crew_quarters/kitchen) || istype(A, /area/crew_quarters/cafeteria)) //Kitchen messes
//Kitchen areas. Broken eggs, flour, spilled milk (no crying allowed.)
var/static/list/kitchen_dirt_areas = typecacheof(list(/area/crew_quarters/kitchen,
/area/crew_quarters/cafeteria))
if(is_type_in_typecache(A, kitchen_dirt_areas))
if(prob(60))
if(prob(50))
new /obj/effect/decal/cleanable/egg_smudge(src)
@@ -79,7 +106,10 @@
new /obj/effect/decal/cleanable/flour(src)
return
if(istype(A, /area/medical) || istype(A, /area/crew_quarters/heads/cmo)) //Kept clean, but chance of blood
//Medical areas. Mostly clean by space-OSHA standards, but has some blood and oil spread about.
var/static/list/medical_dirt_areas = typecacheof(list(/area/medical,
/area/crew_quarters/heads/cmo))
if(is_type_in_typecache(A, medical_dirt_areas))
if(prob(66))
if(prob(5))
new /obj/effect/decal/cleanable/blood/gibs/old(src)
@@ -92,7 +122,10 @@
new /obj/effect/decal/cleanable/vomit/old(src)
return
if(istype(A, /area/science) || istype(A, /area/crew_quarters/heads/hor))
//Science messes. Mostly green glowy stuff -WHICH YOU SHOULD NOT INJEST-.
var/static/list/science_dirt_areas = typecacheof(list(/area/science,
/area/crew_quarters/heads/hor))
if(is_type_in_typecache(A, medical_dirt_areas))
if(prob(20))
new /obj/effect/decal/cleanable/greenglow(src) //this cleans itself up but it might startle you when you see it.
return
code/game/turfs/simulated/floor/fancy_floor.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm (rejected hunks)
@@ -66,7 +66,7 @@
icon_state = "grass"
floor_tile = /obj/item/stack/tile/grass
broken_states = list("sand")
- flags = NONE
+ flags_1 = NONE
var/ore_type = /obj/item/ore/glass
var/turfverb = "uproot"
code/game/turfs/simulated/wall/mineral_walls.dm
+1 -1
View File
@@ -178,7 +178,7 @@
flags_1 = CAN_BE_DIRTY_1 | CHECK_RICOCHET_1
sheet_type = /obj/item/stack/sheet/mineral/titanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock/, /turf/closed/wall/shuttle, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
/turf/closed/wall/mineral/titanium/nodiagonal
smooth = SMOOTH_MORE
code/game/turfs/turf.dm.rej
-1
View File
@@ -1 +0,0 @@
garbage
code/game/world.dm
+2 -1
View File
@@ -3,7 +3,7 @@
SetupExternalRSC()
GLOB.config_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
GLOB.config_error_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once)
@@ -79,6 +79,7 @@
GLOB.world_attack_log = file("[GLOB.log_directory]/attack.log")
GLOB.world_runtime_log = file("[GLOB.log_directory]/runtime.log")
GLOB.world_href_log = file("[GLOB.log_directory]/hrefs.html")
GLOB.sql_error_log = file("[GLOB.log_directory]/sql.log")
WRITE_FILE(GLOB.world_game_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
WRITE_FILE(GLOB.world_attack_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
WRITE_FILE(GLOB.world_runtime_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")

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