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

update to master

Browse Source
This commit is contained in:
kevinz000
2017-08-29 20:09:18 -07:00
parent 26890c6f81 0b82132443
commit 0d104b2cd4
430 changed files with 1839 additions and 5610 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/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/__DEFINES/mobs.dm
+4 -6
View File
@@ -97,13 +97,11 @@
#define AI_IDLE 2
#define AI_OFF 3
//determines if a mob can smash through it
#define ENVIRONMENT_SMASH_NONE 0
#define ENVIRONMENT_SMASH_STRUCTURES 1
#define ENVIRONMENT_SMASH_WALLS 2
#define ENVIRONMENT_SMASH_RWALLS 3
#define ENVIRONMENT_SMASH_STRUCTURES 1 //crates, lockers, ect
#define ENVIRONMENT_SMASH_WALLS 2 //walls
#define ENVIRONMENT_SMASH_RWALLS 4 //rwalls
//SNPCs
code/__DEFINES/status_effects.dm
+2
View File
@@ -42,6 +42,8 @@
#define STATUS_EFFECT_BELLIGERENT /datum/status_effect/belligerent //forces the affected to walk, doing damage if they try to run
#define STATUS_EFFECT_GEISTRACKER /datum/status_effect/geis_tracker //if you're using geis, this tracks that and keeps you from using scripture
#define STATUS_EFFECT_MANIAMOTOR /datum/status_effect/maniamotor //disrupts, damages, and confuses the affected as long as they're in range of the motor
#define MAX_MANIA_SEVERITY 100 //how high the mania severity can go
#define MANIA_DAMAGE_TO_CONVERT 90 //how much damage is required before it'll convert affected targets
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/citadel/cit_genemods.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/obj/item/genemod
name = "genetic modifier"
desc = "Microbodies which can grow, morph, or otherwise change an organism into something else."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "dnainjector"
throw_speed = 3
throw_range = 5
code/datums/action.dm
+2 -2
View File
@@ -431,7 +431,7 @@
name = "Create Throwing Stars (1E)"
desc = "Creates some throwing stars"
button_icon_state = "throwingstar"
icon_icon = 'icons/obj/weapons.dmi'
icon_icon = 'icons/obj/items_and_weapons.dmi'
/datum/action/item_action/ninjanet
name = "Energy Net (20E)"
@@ -443,7 +443,7 @@
name = "Recall Energy Katana (Variable Cost)"
desc = "Teleports the Energy Katana linked to this suit to its wearer, cost based on distance."
button_icon_state = "energy_katana"
icon_icon = 'icons/obj/weapons.dmi'
icon_icon = 'icons/obj/items_and_weapons.dmi'
/datum/action/item_action/ninja_stealth
name = "Toggle Stealth"
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
+10 -9
View File
@@ -19,15 +19,16 @@
old = P.GetExactComponent(type)
else
old = P.GetComponent(dt)
switch(dm)
if(COMPONENT_DUPE_UNIQUE)
old.InheritComponent(src, TRUE)
parent = null //prevent COMPONENT_REMOVING signal
qdel(src)
return
if(COMPONENT_DUPE_HIGHLANDER)
InheritComponent(old, FALSE)
qdel(old)
if(old)
switch(dm)
if(COMPONENT_DUPE_UNIQUE)
old.InheritComponent(src, TRUE)
parent = null //prevent COMPONENT_REMOVING signal
qdel(src)
return
if(COMPONENT_DUPE_HIGHLANDER)
InheritComponent(old, FALSE)
qdel(old)
//let the others know
P.SendSignal(COMSIG_COMPONENT_ADDED, src)
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/martial/sleeping_carp.dm
+1 -1
View File
@@ -184,7 +184,7 @@
throwforce = 20
throw_speed = 2
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "bostaff0"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
code/datums/riding.dm
+1 -1
View File
@@ -416,7 +416,7 @@
/obj/item/riding_offhand
name = "offhand"
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
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'
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/datums/status_effects/debuffs.dm
+14
View File
@@ -139,6 +139,20 @@
if(owner.m_intent == MOVE_INTENT_WALK)
owner.toggle_move_intent()
/datum/status_effect/geis_tracker
id = "geis_tracker"
duration = -1
alert_type = null
var/obj/structure/destructible/clockwork/geis_binding/binding
/datum/status_effect/geis_tracker/on_creation(mob/living/new_owner, obj/structure/destructible/clockwork/geis_binding/new_binding)
. = ..()
if(.)
binding = new_binding
/datum/status_effect/geis_tracker/tick()
if(QDELETED(binding))
qdel(src)
/datum/status_effect/maniamotor
id = "maniamotor"
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
+3 -3
View File
@@ -143,7 +143,7 @@
/obj/item/melee/arm_blade
name = "arm blade"
desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter."
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "arm_blade"
item_state = "arm_blade"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
@@ -222,7 +222,7 @@
/obj/item/gun/magic/tentacle
name = "tentacle"
desc = "A fleshy tentacle that can stretch out and grab things or people."
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "tentacle"
item_state = "tentacle"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
@@ -396,7 +396,7 @@
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_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "ling_shield"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
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_effects/clock_sigils.dm
+30 -9
View File
@@ -11,9 +11,21 @@
var/stat_affected = CONSCIOUS
var/sigil_name = "Sigil"
var/resist_string = "glows blinding white" //string for when a null rod blocks its effects, "glows [resist_string]"
var/list/component_refund = list()
/obj/effect/clockwork/sigil/attackby(obj/item/I, mob/living/user, params)
if(I.force && !is_servant_of_ratvar(user))
if(is_servant_of_ratvar(user))
if(istype(I, /obj/item/clockwork/slab))
user.visible_message("<span class='warning'>[user] starts to dispel [src]...</span>", "<span class='danger'>You start to dispel [src]...</span>")
if(do_after(user, 20, target = src))
user.visible_message("<span class='warning'>[user] dispels [src]!</span>", "<span class='danger'>You dispel [src]!</span>")
for(var/i in component_refund)
if(component_refund[i])
for(var/r in 1 to component_refund[i])
generate_cache_component(i, src)
qdel(src)
return 1
else if(I.force)
user.visible_message("<span class='warning'>[user] scatters [src] with [I]!</span>", "<span class='danger'>You scatter [src] with [I]!</span>")
qdel(src)
return 1
@@ -63,6 +75,7 @@
light_power = 1
light_color = "#FAE48C"
sigil_name = "Sigil of Transgression"
component_refund = list(HIEROPHANT_ANSIBLE = 1)
/obj/effect/clockwork/sigil/transgression/sigil_effects(mob/living/L)
var/target_flashed = L.flash_act()
@@ -94,27 +107,33 @@
light_color = "#FAE48C"
stat_affected = UNCONSCIOUS
resist_string = "glows faintly yellow"
sigil_name = "Sigil of Submission"
component_refund = list(GEIS_CAPACITOR = 1)
var/convert_time = 80
var/delete_on_finish = TRUE
sigil_name = "Sigil of Submission"
var/glow_type = /obj/effect/temp_visual/ratvar/sigil/submission
/obj/effect/clockwork/sigil/submission/sigil_effects(mob/living/L)
if(istype(L.buckled, /obj/structure/destructible/clockwork/geis_binding))
if(is_servant_of_ratvar(L.pulledby))
L.pulledby.stop_pulling()
if(is_servant_of_ratvar(L.buckled.pulledby))
L.buckled.pulledby.stop_pulling()
L.visible_message("<span class='warning'>[src] begins to glow a piercing magenta!</span>", "<span class='sevtug'>You feel something start to invade your mind...</span>")
var/oldcolor = color
animate(src, color = "#AF0AAF", time = convert_time, flags_1 = ANIMATION_END_NOW)
animate(src, color = "#AF0AAF", time = convert_time, flags = ANIMATION_END_NOW)
var/obj/effect/temp_visual/ratvar/sigil/glow
if(glow_type)
glow = new glow_type(get_turf(src))
animate(glow, alpha = 255, time = convert_time)
var/I = 0
while(I < convert_time && get_turf(L) == get_turf(src))
while(I < convert_time && !QDELETED(L) && get_turf(L) == get_turf(src))
I++
sleep(1)
if(get_turf(L) != get_turf(src))
if(QDELETED(L) || get_turf(L) != get_turf(src))
if(glow)
qdel(glow)
animate(src, color = oldcolor, time = 20, flags_1 = ANIMATION_END_NOW)
animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20)
visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
return
@@ -136,7 +155,7 @@
to_chat(M, "<span class='heavy_brass'>[message] you!</span>")
else
to_chat(M, "<span class='heavy_brass'>[message] [L.real_name]!</span>")
animate(src, color = oldcolor, time = 20, flags_1 = ANIMATION_END_NOW)
animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20)
visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
@@ -152,6 +171,7 @@
light_color = "#EC8A2D"
resist_string = "glows faintly"
sigil_name = "Sigil of Transmission"
component_refund = list(HIEROPHANT_ANSIBLE = 1)
affects_servants = TRUE
var/power_charge = 0 //starts with no power
var/drain_range = 14
@@ -296,6 +316,7 @@
stat_affected = DEAD
resist_string = "glows shimmering yellow"
sigil_name = "Vitality Matrix"
component_refund = list(VANGUARD_COGWHEEL = 1)
var/revive_cost = 150
var/sigil_active = FALSE
var/animation_number = 3 //each cycle increments this by 1, at 4 it produces an animation and resets
@@ -314,7 +335,7 @@
if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active)
return
visible_message("<span class='warning'>[src] begins to glow bright blue!</span>")
animate(src, alpha = 255, time = 10, flags_1 = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
sleep(10)
//as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality
while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src))
@@ -380,4 +401,4 @@
animation_number = initial(animation_number)
sigil_active = FALSE
visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
animate(src, alpha = initial(alpha), time = 10, flags_1 = ANIMATION_END_NOW)
animate(src, alpha = initial(alpha), time = 10, flags = ANIMATION_END_NOW)
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_helpers/slab_abilities.dm
+6 -48
View File
@@ -24,15 +24,10 @@
//For the Geis scripture; binds a target to convert.
/obj/effect/proc_holder/slab/geis
ranged_mousepointer = 'icons/effects/geis_target.dmi'
var/obj/structure/destructible/clockwork/geis_binding/binding //we always have a reference to the binding
var/obj/structure/destructible/clockwork/geis_binding/pulled_binding //we use this to see if we're pulling it or not
/obj/effect/proc_holder/slab/geis/remove_ranged_ability(msg)
..()
binding = null
pulled_binding = null
/obj/effect/proc_holder/slab/geis/InterceptClickOn(mob/living/caller, params, atom/target)
if(..())
return TRUE
var/turf/T = ranged_ability_user.loc
if(!isturf(T))
return TRUE
@@ -40,20 +35,6 @@
var/target_is_binding = istype(target, /obj/structure/destructible/clockwork/geis_binding)
if((target_is_binding || isliving(target)) && ranged_ability_user.Adjacent(target))
if(in_progress || ..())
var/mob/living/L = target
if(!pulled_binding)
if(target == binding || (isliving(target) && L.buckled == binding))
pulled_binding = binding
ranged_ability_user.start_pulling(binding)
remove_mousepointer(ranged_ability_user.client)
ranged_mousepointer = 'icons/effects/geis_target_remove.dmi'
add_mousepointer(ranged_ability_user.client)
else if(target == pulled_binding || (isliving(target) && L.buckled == pulled_binding))
ranged_ability_user.visible_message("<span class='warning'>[ranged_ability_user] dispels [pulled_binding]!</span>", "<span class='danger'>You dispel the binding!</span>")
binding.take_damage(obj_integrity)
remove_ranged_ability()
return TRUE
if(target_is_binding)
var/obj/structure/destructible/clockwork/geis_binding/GB = target
GB.repair_and_interrupt()
@@ -80,42 +61,19 @@
add_logs(ranged_ability_user, L, "rebound with Geis")
successful = TRUE
else
in_progress = TRUE
clockwork_say(ranged_ability_user, text2ratvar("Be bound, heathen!"))
remove_mousepointer(ranged_ability_user.client)
ranged_mousepointer = 'icons/effects/geis_target_remove.dmi'
add_mousepointer(ranged_ability_user.client)
add_logs(ranged_ability_user, L, "bound with Geis")
playsound(target, 'sound/magic/blink.ogg', 50, TRUE, frequency = 0.5)
playsound(target, 'sound/magic/blink.ogg', 50, TRUE, -4, frequency = 0.5)
if(slab.speed_multiplier >= 0.5) //excuse my debug...
ranged_ability_user.notransform = TRUE
addtimer(CALLBACK(src, .proc/reset_user_notransform, ranged_ability_user), 5) //stop us moving for a little bit so we don't break the binding immediately
addtimer(CALLBACK(src, .proc/reset_user_notransform, ranged_ability_user), 4) //stop us moving for a little bit so we don't break the binding immediately
if(L.buckled)
L.buckled.unbuckle_mob(target, TRUE)
binding = new(get_turf(target))
var/obj/structure/destructible/clockwork/geis_binding/binding = new(get_turf(target))
binding.setDir(target.dir)
binding.buckle_mob(target, TRUE)
pulled_binding = binding
ranged_ability_user.start_pulling(binding)
slab.busy = "sustaining Geis"
slab.flags_1 |= NODROP_1
while(!QDELETED(binding) && !QDELETED(ranged_ability_user))
if(ranged_ability_user.pulling == binding)
pulled_binding = binding
if(ranged_ability_user.client && ranged_ability_user.client.mouse_pointer_icon == 'icons/effects/geis_target.dmi')
remove_mousepointer(ranged_ability_user.client)
ranged_mousepointer = 'icons/effects/geis_target_remove.dmi'
add_mousepointer(ranged_ability_user.client)
else //if we're not pulling it, swap our mousepointer
pulled_binding = null
if(ranged_ability_user.client && ranged_ability_user.client.mouse_pointer_icon == 'icons/effects/geis_target_remove.dmi')
remove_mousepointer(ranged_ability_user.client)
ranged_mousepointer = 'icons/effects/geis_target.dmi'
add_mousepointer(ranged_ability_user.client)
sleep(1)
if(!QDELETED(slab))
slab.flags_1 &= ~NODROP_1
in_progress = FALSE
ranged_ability_user.apply_status_effect(STATUS_EFFECT_GEISTRACKER, binding)
successful = TRUE
remove_ranged_ability()
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/clock_cult/clock_scripture.dm
+3
View File
@@ -57,6 +57,9 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or
if(slab.busy)
to_chat(invoker, "<span class='warning'>[slab] refuses to work, displaying the message: \"[slab.busy]!\"</span>")
return FALSE
if(invoker.has_status_effect(STATUS_EFFECT_GEISTRACKER))
to_chat(invoker, "<span class='warning'>[slab] refuses to work, displaying the message: \"Sustaining Geis!\"</span>")
return FALSE
slab.busy = "Invocation ([name]) in progress"
if(GLOB.ratvar_awakens)
channel_time *= 0.5 //if ratvar has awoken, half channel time and no cost
code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm
+51 -9
View File
@@ -2,8 +2,8 @@
/obj/structure/destructible/clockwork/geis_binding
name = "glowing ring"
desc = "A flickering, glowing purple ring around a target."
clockwork_desc = "A binding ring around a target, preventing them from taking action while they're being converted."
max_integrity = 25
clockwork_desc = "A binding ring around a target, preventing them from taking action."
max_integrity = 20
light_range = 2
light_power = 0.8
light_color = "#AF0AAF"
@@ -18,6 +18,8 @@
can_buckle = TRUE
buckle_lying = 0
var/mob_layer = MOB_LAYER
var/last_mob_health = 0
var/apply_time = 0
/obj/structure/destructible/clockwork/geis_binding/Initialize(mapload, obj/item/clockwork/slab/the_slab)
. = ..()
@@ -33,21 +35,39 @@
icon_state = "geisbinding"
/obj/structure/destructible/clockwork/geis_binding/process()
var/tick_damage = 1
if(locate(/obj/effect/clockwork/sigil/submission) in loc)
tick_damage *= 0.5
if(LAZYLEN(buckled_mobs))
for(var/V in buckled_mobs)
var/mob/living/L = V
if(is_servant_of_ratvar(L)) //servants are freed automatically
take_damage(obj_integrity)
return
var/tick_damage = 1
if(!is_servant_of_ratvar(pulledby))
tick_damage++
if(last_mob_health > L.health)
tick_damage += last_mob_health - L.health
last_mob_health = L.health
if(L.layer != mob_layer)
mob_layer = L.layer
layer = mob_layer - 0.01
cut_overlays()
add_overlay(mutable_appearance('icons/effects/clockwork_effects.dmi', "geisbinding_top", mob_layer + 0.01))
break
take_damage(tick_damage, sound_effect = FALSE)
playsound(src, 'sound/effects/empulse.ogg', tick_damage * 20, TRUE)
playsound(src, 'sound/effects/empulse.ogg', tick_damage * 40, TRUE, -4)
/obj/structure/destructible/clockwork/geis_binding/attack_hand(mob/living/user)
return
/obj/structure/destructible/clockwork/geis_binding/attackby(obj/item/I, mob/user, params)
if(is_servant_of_ratvar(user) && istype(I, /obj/item/clockwork/slab))
user.visible_message("<span class='warning'>[user] starts to dispel [src]...</span>", "<span class='danger'>You start to dispel [src]...</span>")
if(do_after(user, 30, target = src))
user.visible_message("<span class='warning'>[user] dispels [src]!</span>", "<span class='danger'>You dispel [src]!</span>")
take_damage(obj_integrity)
return 1
return ..()
/obj/structure/destructible/clockwork/geis_binding/emp_act(severity)
new /obj/effect/temp_visual/emp(loc)
qdel(src)
@@ -56,16 +76,22 @@
..()
if(M.buckled == src)
desc = "A flickering, glowing purple ring around [M]."
clockwork_desc = "A binding ring around [M], preventing [M.p_them()] from taking action while [M.p_theyre()] being converted."
clockwork_desc = "A binding ring around [M], preventing [M.p_them()] from taking action."
icon_state = "geisbinding"
mob_layer = M.layer
layer = M.layer - 0.01
add_overlay(mutable_appearance('icons/effects/clockwork_effects.dmi', "geisbinding_top", M.layer + 0.01))
layer = mob_layer - 0.01
add_overlay(mutable_appearance('icons/effects/clockwork_effects.dmi', "geisbinding_top", mob_layer + 0.01))
last_mob_health = M.health
apply_time = world.time
for(var/obj/item/I in M.held_items)
M.dropItemToGround(I)
for(var/i in M.get_empty_held_indexes())
var/obj/item/geis_binding/B = new(M)
M.put_in_hands(B, i)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(!C.handcuffed)
C.handcuffed = new /obj/item/restraints/handcuffs/energy/clock(C)
M.regenerate_icons()
M.visible_message("<span class='warning'>A [name] appears around [M]!</span>", "<span class='warning'>A [name] appears around you!</span>")
repair_and_interrupt()
@@ -79,8 +105,17 @@
animate(G, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT)
animate(T, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT)
M.visible_message("<span class='warning'>[src] snaps into glowing pieces and dissipates!</span>")
M.AdjustStun(-130 + (apply_time - world.time), 1, 1) //remove exactly as much stun as was applied
if(iscarbon(M))
var/mob/living/carbon/C = M
C.silent = max(C.silent - 7, 0)
for(var/obj/item/geis_binding/GB in M.held_items)
M.dropItemToGround(GB, TRUE)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(istype(C.handcuffed, /obj/item/restraints/handcuffs/energy/clock))
QDEL_NULL(C.handcuffed)
C.update_handcuffed()
/obj/structure/destructible/clockwork/geis_binding/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
playsound(src, 'sound/effects/empulse.ogg', 50, 1)
@@ -130,3 +165,10 @@
/obj/item/geis_binding/pre_attackby(atom/target, mob/living/user, params)
return FALSE
/obj/item/restraints/handcuffs/energy/clock
name = "glowing rings"
desc = "Flickering rings preventing you from holding items."
icon = 'icons/effects/clockwork_effects.dmi'
icon_state = "geisbinding_full"
flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1
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/gamemodes/miniantags/borer/borer.dm
+1 -1
View File
@@ -1093,7 +1093,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 10)
/datum/action/innate/borer/jumpstart_host
name = "Jumpstart Host"
desc = "Bring your host back to life."
icon_icon = 'icons/obj/weapons.dmi'
icon_icon = 'icons/obj/items_and_weapons.dmi'
button_icon_state = "defibpaddles0"
/datum/action/innate/borer/jumpstart_host/Activate()
code/game/gamemodes/wizard/artefact.dm
+1 -1
View File
@@ -202,7 +202,7 @@
/obj/item/multisword
name = "multiverse sword"
desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side."
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "multiverse"
item_state = "multiverse"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
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
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Better stay away from that thing."
density = FALSE
anchored = TRUE
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "uglymine"
var/triggered = 0
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/effects/misc.dm
+1 -1
View File
@@ -2,7 +2,7 @@
/obj/effect/spresent
name = "strange present"
desc = "It's a ... present?"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "strangepresent"
density = TRUE
anchored = FALSE
code/game/objects/items.dm
+1 -1
View File
@@ -6,7 +6,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item
name = "item"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
var/item_state = null
var/lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
var/righthand_file = 'icons/mob/inhands/items_righthand.dmi'
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/blueprints.dm
+3 -3
View File
@@ -15,7 +15,7 @@
/obj/item/areaeditor
name = "area modification item"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "blueprints"
attack_verb = list("attacked", "bapped", "hit")
var/fluffnotice = "Nobody's gonna read this stuff!"
@@ -49,7 +49,7 @@
/obj/item/areaeditor/blueprints
name = "station blueprints"
desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "blueprints"
fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -361,6 +361,6 @@
/obj/item/areaeditor/blueprints/cyborg
name = "station schematics"
desc = "A digital copy of the station blueprints stored in your memory."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "blueprints"
fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station."
code/game/objects/items/charter.dm
+1 -1
View File
@@ -96,7 +96,7 @@
/obj/item/station_charter/flag
name = "nanotrasen banner"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
name_type = "planet"
icon_state = "banner"
item_state = "banner"
code/game/objects/items/cosmetics.dm
+2 -2
View File
@@ -2,7 +2,7 @@
gender = PLURAL
name = "red lipstick"
desc = "A generic brand of lipstick."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "lipstick"
w_class = WEIGHT_CLASS_TINY
var/colour = "red"
@@ -105,7 +105,7 @@
/obj/item/razor
name = "electric razor"
desc = "The latest and greatest power razor born from the science of shaving."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "razor"
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
code/game/objects/items/courtroom.dm
+2 -2
View File
@@ -5,7 +5,7 @@
/obj/item/gavelhammer
name = "gavel hammer"
desc = "Order, order! No bombs in my courthouse."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "gavelhammer"
force = 5
throwforce = 6
@@ -21,7 +21,7 @@
/obj/item/gavelblock
name = "gavel block"
desc = "Smack it with a gavel hammer when the assistants get rowdy."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "gavelblock"
force = 2
throwforce = 2
code/game/objects/items/defib.dm
+4 -4
View File
@@ -4,7 +4,7 @@
/obj/item/defibrillator
name = "defibrillator"
desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients."
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "defibunit"
item_state = "defibunit"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -272,7 +272,7 @@
/obj/item/twohanded/shockpaddles
name = "defibrillator paddles"
desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks."
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "defibpaddles"
item_state = "defibpaddles"
force = 0
@@ -570,7 +570,7 @@
/obj/item/twohanded/shockpaddles/cyborg
name = "cyborg defibrillator paddles"
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -593,7 +593,7 @@
name = "syndicate defibrillator paddles"
desc = "A pair of paddles used to revive deceased operatives. It possesses both the ability to penetrate armor and to deliver powerful shocks offensively."
combat = TRUE
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
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/dna_injector.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/dnainjector
name = "\improper DNA injector"
desc = "This injects the person with DNA."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "dnainjector"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
code/game/objects/items/extinguisher.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/extinguisher
name = "fire extinguisher"
desc = "A traditional red fire extinguisher."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg'
code/game/objects/items/handcuffs.dm
+2 -2
View File
@@ -7,7 +7,7 @@
name = "handcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "handcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
@@ -231,7 +231,7 @@
name = "leg cuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "handcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
code/game/objects/items/his_grace.dm
+1 -1
View File
@@ -9,7 +9,7 @@
desc = "A toolbox painted bright green. Looking at it makes you feel uneasy."
icon_state = "his_grace"
item_state = "artistic_toolbox"
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
w_class = WEIGHT_CLASS_GIGANTIC
origin_tech = "combat=4;engineering=4;syndicate=2"
force = 12
code/game/objects/items/holy_weapons.dm
+1 -1
View File
@@ -354,7 +354,7 @@
sharpness = IS_BLUNT
hitsound = "swing_hit"
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
icon = 'icons/obj/weapons.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "bostaff0"
item_state = "bostaff0"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'

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