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

Maps and misc

Browse Source
This commit is contained in:
Poojawa
2018-01-31 06:20:26 -06:00
parent 67ac5abfaa
commit 56232d5d60
28 changed files with 68789 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CODEOWNERS
+11 -10
View File
@@ -8,10 +8,10 @@
/code/__DEFINES/clockcult.dm @ChangelingRain
/code/datums/antagonists/datum_clockcult.dm @ChangelingRain
/code/game/gamemodes/blob/* @ChangelingRain
/code/game/gamemodes/clock_cult/* @ChangelingRain
/code/game/gamemodes/miniantags/revenant* @ChangelingRain
/code/game/objects/effects/temporary_visuals/* @ChangelingRain
/code/game/gamemodes/blob/ @ChangelingRain
/code/game/gamemodes/clock_cult/ @ChangelingRain
/code/game/gamemodes/miniantags/revenant/ @ChangelingRain
/code/game/objects/effects/temporary_visuals/ @ChangelingRain
/code/modules/reagents/chemistry/reagents/blob_reagents.dm @ChangelingRain
# Cyberboss
@@ -24,14 +24,14 @@
/code/controllers/subsystem/mapping.dm @Cyberboss
/code/controllers/globals.dm @Cyberboss
/code/datums/helper_datums/getrev.dm @Cyberboss
/code/datums/components/* @Cyberboss
/code/datums/components/ @Cyberboss
/code/datums/map_config.dm @Cyberboss
/code/datums/forced_movement.dm @Cyberboss
/code/datums/holocall.dm @Cyberboss
/code/modules/admin/verbs/adminhelp.dm @Cyberboss
/code/modules/admin/verbs/adminpm.dm @Cyberboss
/code/modules/server_tools/* @Cyberboss
/code/modules/mapping/* @Cyberboss
/code/modules/server_tools/ @Cyberboss
/code/modules/mapping/ @Cyberboss
# duncathan
@@ -40,9 +40,9 @@
# Jordie0608
/SQL/* @Jordie0608
/SQL/ @Jordie0608
/code/controllers/subsystem/dbcore.dm @Jordie0608
/tools/SQLAlertEmail/* @Jordie0608
/tools/SQLAlertEmail/ @Jordie0608
# MrStonedOne
@@ -57,9 +57,10 @@
# ninjanomnom
/code/controllers/subsystem/shuttle.dm @ninjanomnom
/code/modules/shuttle/* @ninjanomnom
/code/modules/shuttle/ @ninjanomnom
# ShizCalev
/_maps/ @ShizCalev
/sound/ @ShizCalev
.github/CONTRIBUTING.md
+12 -6
View File
@@ -314,7 +314,7 @@ var/list/bag_of_items = list(sword, apple, coinpouch, sword, sword)
var/obj/item/sword/best_sword
for(var/obj/item/sword/S in bag_of_items)
if(!best_sword || S.damage > best_sword.damage)
best_sword = S
best_sword = S
```
The above is a simple proc for checking all swords in a container and returning the one with the highest damage, and it uses DM's standard syntax for a for-loop by specifying a type in the variable of the for's header that DM interprets as a type to filter by. It performs this filter using ```istype()``` (or some internal-magic similar to ```istype()``` - this is BYOND, after all). This is fine in its current state for ```bag_of_items```, but if ```bag_of_items``` contained ONLY swords, or only SUBTYPES of swords, then the above is inefficient. For example:
```DM
@@ -322,7 +322,7 @@ var/list/bag_of_swords = list(sword, sword, sword, sword)
var/obj/item/sword/best_sword
for(var/obj/item/sword/S in bag_of_swords)
if(!best_sword || S.damage > best_sword.damage)
best_sword = S
best_sword = S
```
specifies a type for DM to filter by.
@@ -334,7 +334,7 @@ var/obj/item/sword/best_sword
for(var/s in bag_of_swords)
var/obj/item/sword/S = s
if(!best_sword || S.damage > best_sword.damage)
best_sword = S
best_sword = S
```
Of course, if the list contains data of a mixed type then the above optimisation is DANGEROUS, as it will blindly typecast all data in the list as the specified type, even if it isn't really that type, causing runtime errors.
@@ -355,9 +355,9 @@ DM has a var keyword, called global. This var keyword is for vars inside of type
```DM
mob
var
global
thing = TRUE
var
global
thing = TRUE
```
This does NOT mean that you can access it everywhere like a global var. Instead, it means that that var will only exist once for all instances of its type, in this case that var will only exist once for all mobs - it's shared across everything in its type. (Much more like the keyword `static` in other languages like PHP/C++/C#/Java)
@@ -381,6 +381,12 @@ There is no strict process when it comes to merging pull requests. Pull requests
* Please explain why you are submitting the pull request, and how you think your change will be beneficial to the game. Failure to do so will be grounds for rejecting the PR.
## Porting features/sprites/sounds/tools from other codebases
If you are porting features/tools from other codebases, you must give them credit where it's due. Typically, crediting them in your pull request and the changelog is the recommended way of doing it. Take note of what license they use though, porting stuff from AGPLv3 and GPLv3 codebases are allowed.
Regarding sprites & sounds, you must credit the artist and possibly the codebase. All /tg/station assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) license unless otherwise indicated. However if you are porting assets from GoonStation or usually any assets under the [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/) license are to go into the 'goon' folder of the /tg/station codebase.
## Banned content
Do not add any of the following in a Pull Request or risk getting the PR closed:
* National Socialist Party of Germany content, National Socialist Party of Germany related content, or National Socialist Party of Germany references
.github/ISSUE_TEMPLATE.md
+6 -6
View File
@@ -1,9 +1,9 @@
[Directions]: # (If you discovered this issue from playing tgstation hosted servers
[Round ID]: # (If you discovered this issue from playing tgstation hosted servers:)
[Round ID]: # (**INCLUDE THE ROUND ID**)
[Round ID]: # (It can be found in the Status panel or retrieved from https://atlantaned.space/statbus/round.php ! The round id let's us look up valuable information and logs for the round the bug happened.)
[Testmerges]: # (If you believe the issue to be caused by a test merge [OOC tab -> Show Server Revision], report it in the pull request's comment section instead.)
INCLUDE THE ROUND ID
[Reproduction]: # (Explain your issue in detail, including the steps to reproduce it. Issues without proper reproduction steps or explanation are open to being ignored/closed by maintainers.)
from the Status panel or retrieve it from https://atlantaned.space/statbus/round.php ! If you believe the issue to be caused by a test merge [OOC tab -> Show Server Revision], report it in the pull request's comment section instead. Explain your issue in detail, including the steps to reproduce it.)
[For Admins]: # (Oddities induced by var-edits and other admin tools are not necessarily bugs. Verify that your issues occur under regular circumstances before reporting them.)
[For Admins]: # (Oddities induced by var-edits and other admin tools are not necessarily bugs. Verify that your issues occur under regular circumstances before reporting them.)
.github/PULL_REQUEST_TEMPLATE.md
+6 -4
View File
@@ -1,5 +1,4 @@
[Changelogs]: # (Please make a changelog if you're adding, removing or changing content that'll affect players. This includes, but is not limited to, new features, sprites, sounds; balance changes; map edits and important fixes. An example changelog has been provided below for you to edit or remove. If you need help, read https://github.com/tgstation/tgstation/wiki/Changelogs)
[Changelogs]: # (Your PR should contain a detailed changelog of notable changes, titled and categorized appropriately. This includes, new features, sprites, sounds, balance changes, admin tools, map edits, removals, big refactors, config changes, hosting changes and important fixes. An example changelog has been provided below for you to edit. If you need additional help, read https://github.com/tgstation/tgstation/wiki/Changelogs)
:cl: optional name here
add: Added new things
@@ -8,13 +7,16 @@ del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
wip: added a few works in progress
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
experiment: added an experimental thingy
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:
[why]: # (Please add a short description [two lines down] of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding.)
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+8
View File
@@ -2597,6 +2597,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -2606,6 +2607,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -2711,6 +2713,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -2718,6 +2721,7 @@
/area/lavaland/surface/outdoors)
"iv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -3097,6 +3101,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -3161,6 +3166,7 @@
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/main)
"jk" = (
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -4331,6 +4337,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -4338,6 +4345,7 @@
/area/lavaland/surface/outdoors)
"lw" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating{
baseturfs = /turf/open/lava/smooth/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+3
View File
@@ -1825,6 +1825,9 @@
/obj/item/folder/yellow{
pixel_x = -6
},
/obj/item/device/gps{
gpstag = "Distress Signal"
},
/turf/open/floor/plasteel/darkblue/side{
dir = 6;
initial_gas_mix = "TEMP=2.7"
_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm
+858
View File
@@ -0,0 +1,858 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/space/basic,
/area/space)
"b" = (
/obj/docking_port/stationary{
dheight = 0;
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_away";
name = "Deep Space";
width = 35;
json_key = "whiteship"
},
/turf/open/space,
/area/space)
(1,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(3,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(4,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(5,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(6,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(7,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(8,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(9,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(10,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(11,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(12,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(13,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(14,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(15,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(16,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(17,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(18,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(19,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(20,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(21,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(22,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(23,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(24,1,1) = {"
b
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(25,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(26,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(27,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(28,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(29,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(30,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(31,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(32,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(33,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(34,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(35,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
_maps/_basemap.dm
+2 -2
View File
@@ -6,7 +6,7 @@
#ifndef LOWMEMORYMODE
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#include "map_files\generic\Space2.dmm"
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\generic\City_of_Cogs.dmm"
@@ -22,4 +22,4 @@
#include "templates.dm"
#endif
#endif
#endif
#endif
_maps/map_files/BoxStation/BoxStation.dmm
+12 -9
View File
@@ -13849,8 +13849,8 @@
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"aIB" = (
/obj/structure/bodycontainer/crematorium,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/bodycontainer/crematorium,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aIC" = (
@@ -23075,6 +23075,9 @@
/area/medical/morgue)
"bho" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/bodycontainer/morgue{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"bhp" = (
@@ -42943,7 +42946,7 @@
/turf/open/floor/plasteel/dark/telecomms/mainframe,
/area/tcommsat/server)
"ccg" = (
/obj/machinery/message_server,
/obj/machinery/telecomms/message_server,
/turf/open/floor/plasteel/dark/telecomms/mainframe,
/area/tcommsat/server)
"cch" = (
@@ -93546,9 +93549,9 @@ bdp
bdc
bfL
beY
biz
biz
biz
bhm
bhm
bhm
bkR
bfL
boo
@@ -97172,7 +97175,7 @@ bIP
bPA
bJN
bRU
bSZ
bEm
bEm
bJN
bRU
@@ -97180,7 +97183,7 @@ bXe
bEm
bJN
bRU
bSZ
bEm
bEm
bDb
cgi
@@ -99742,7 +99745,7 @@ bOx
bPJ
bJN
bEm
bSZ
bEm
bRU
bJN
bEm
@@ -99750,7 +99753,7 @@ bXe
bRU
bJN
bEm
bSZ
bEm
bRU
bDb
aaf
_maps/map_files/Deltastation/DeltaStation2.dmm
+88 -27
View File
@@ -53515,7 +53515,7 @@
},
/area/tcommsat/server)
"cex" = (
/obj/machinery/message_server,
/obj/machinery/telecomms/message_server,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -90597,18 +90597,24 @@
},
/area/medical/morgue)
"dDM" = (
/obj/structure/bodycontainer/morgue,
/obj/structure/bodycontainer/morgue{
dir = 2
},
/turf/open/floor/plating,
/area/medical/morgue)
"dDN" = (
/obj/structure/bodycontainer/morgue,
/obj/structure/bodycontainer/morgue{
dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/medical/morgue)
"dDO" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -90618,6 +90624,9 @@
/obj/machinery/light/small{
dir = 1
},
/obj/structure/bodycontainer/morgue{
dir = 2
},
/turf/open/floor/plating,
/area/medical/morgue)
"dDQ" = (
@@ -91109,7 +91118,7 @@
"dEV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/turf/open/floor/plasteel/neutral,
/area/medical/morgue)
"dEW" = (
/turf/open/floor/plasteel/neutral,
@@ -92435,6 +92444,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/neutral,
/area/medical/morgue)
"dHK" = (
@@ -93091,6 +93101,9 @@
"dIW" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small,
/obj/structure/bodycontainer/morgue{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -93105,6 +93118,9 @@
/obj/structure/sign/poster/official/bless_this_spess{
pixel_y = -32
},
/obj/structure/bodycontainer/morgue{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -93122,14 +93138,18 @@
},
/area/medical/morgue)
"dIZ" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
dir = 1
},
/turf/open/floor/plating,
/area/medical/morgue)
"dJa" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/light_construct/small,
/obj/effect/landmark/event_spawn,
/obj/structure/bodycontainer/morgue{
dir = 1
},
/turf/open/floor/plating,
/area/medical/morgue)
"dJb" = (
@@ -100955,10 +100975,11 @@
/turf/closed/wall/r_wall,
/area/chapel/office)
"dZO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/bodycontainer/crematorium{
dir = 4;
id = "cremawheat"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -105025,6 +105046,45 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
"QOn" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/medical/morgue)
"QOo" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/medical/morgue)
"QOp" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/neutral,
/area/medical/morgue)
"QOq" = (
/obj/structure/bodycontainer/morgue{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/medical/morgue)
"QOr" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/medical/morgue)
(1,1,1) = {"
aaa
@@ -126533,7 +126593,7 @@ dml
dsX
djb
dvU
dxC
drv
dru
dhD
aad
@@ -135012,7 +135072,7 @@ doy
dqo
drM
dtf
duB
duz
dwd
djA
dzp
@@ -135921,7 +135981,7 @@ aaa
aaa
aaa
aaa
aci
aaa
aaa
aaa
aaa
@@ -139521,7 +139581,7 @@ aaa
aaa
aaa
aaa
aeu
aaa
aaa
aid
aiA
@@ -143879,7 +143939,7 @@ aad
aaa
acF
aaa
adu
aaa
aaa
aaa
aaa
@@ -145813,10 +145873,10 @@ dzR
dAU
dCA
dDM
dDO
QOp
dGl
dHG
dDN
dHH
QOq
dCy
dKZ
dMy
@@ -146069,7 +146129,7 @@ dym
dzS
dAV
dCB
dDJ
QOn
dEV
dGm
dHH
@@ -146327,10 +146387,10 @@ dzT
dAW
dCB
dDN
dDN
dEW
dGl
dHG
dDO
dHH
QOr
dCy
dKX
dMA
@@ -146349,7 +146409,7 @@ aaa
aaa
aaa
aaa
dUD
aaa
aaa
aaa
aaa
@@ -146583,7 +146643,7 @@ dyo
dzU
dAX
dCB
dDJ
QOn
dEW
dGn
dHI
@@ -146841,9 +146901,9 @@ dzV
dAY
dCB
dDO
dDN
dEW
dGl
dHG
dHH
dIZ
dCy
dKZ
@@ -152139,7 +152199,7 @@ aaa
aaa
aaa
aaa
aAM
aaa
aaa
aaa
aaa
@@ -152685,7 +152745,7 @@ aaa
aaa
aaa
aaa
bAa
aaa
aaa
aaa
aaa
@@ -152930,7 +152990,7 @@ aad
aaa
aaa
aaa
bgW
aaa
aaa
aaa
aaa
@@ -170561,3 +170621,4 @@ aaa
aaa
aaa
"}
_maps/map_files/MetaStation/MetaStation.dmm
+74 -46
View File
@@ -41830,7 +41830,7 @@
/turf/closed/wall/r_wall,
/area/space/nearstation)
"bJg" = (
/obj/machinery/message_server,
/obj/machinery/telecomms/message_server,
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"bJh" = (
@@ -65518,6 +65518,9 @@
/area/medical/medbay/aft)
"cFU" = (
/obj/machinery/light/small,
/obj/structure/bodycontainer/morgue{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cFV" = (
@@ -68608,8 +68611,10 @@
},
/area/medical/virology)
"cLT" = (
/obj/structure/bodycontainer/crematorium,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/bodycontainer/morgue{
dir = 2
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cLU" = (
@@ -68921,9 +68926,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/obj/machinery/button/crematorium{
pixel_x = -25
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cMD" = (
@@ -69364,7 +69366,11 @@
/turf/open/floor/plating/airless,
/area/medical/virology)
"cNt" = (
/obj/structure/bodycontainer/morgue,
/obj/machinery/button/crematorium{
id = "cremawheat";
pixel_x = -26;
req_access_txt = "27"
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cNu" = (
@@ -69930,6 +69936,11 @@
dir = 1;
pixel_y = -22
},
/obj/structure/table,
/obj/item/storage/box/bodybags{
pixel_x = 2;
pixel_y = 2
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cOG" = (
@@ -71963,7 +71974,6 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTf" = (
/obj/structure/table,
/obj/machinery/light/small{
dir = 8
},
@@ -71971,10 +71981,6 @@
dir = 4;
pixel_x = -22
},
/obj/item/storage/box/bodybags{
pixel_x = 2;
pixel_y = 2
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"cTg" = (
@@ -75231,6 +75237,9 @@
dir = 2;
network = list("SS13","Medbay")
},
/obj/structure/bodycontainer/morgue{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"dbs" = (
@@ -80644,6 +80653,24 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"QuX" = (
/obj/structure/bodycontainer/morgue{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"QuY" = (
/obj/structure/bodycontainer/morgue{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"QuZ" = (
/obj/structure/bodycontainer/crematorium{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
(1,1,1) = {"
aaa
@@ -90552,7 +90579,7 @@ aZZ
bOd
EDi
aaa
cWp
aaa
aaa
aaa
aaa
@@ -92083,7 +92110,7 @@ bxw
aVs
aaa
aaa
cVv
aaa
aaa
aaa
aVs
@@ -93099,7 +93126,7 @@ djC
aaa
aaa
aaa
beC
aaa
aaa
aaa
aaa
@@ -94373,7 +94400,7 @@ auG
dnd
dhK
dnk
aRG
dnH
aSP
dne
dhM
@@ -95645,7 +95672,7 @@ aaa
aaa
aaa
aaa
azh
aaa
aaa
aaa
aaa
@@ -96170,7 +96197,7 @@ aaa
aaa
aaa
aaa
cUV
aaa
aaa
aaa
aaa
@@ -100875,7 +100902,7 @@ cLT
cMC
cNt
cTf
cNt
QuZ
cMI
cPC
djX
@@ -103869,7 +103896,7 @@ aaa
aaa
aaa
aaa
ayt
aaa
aaa
aaa
azC
@@ -105743,11 +105770,11 @@ cyf
cyZ
cAc
ctA
cCf
cCf
cCj
cCj
cDY
cCf
cCf
cCj
cCj
cCe
cHJ
bTs
@@ -106001,9 +106028,9 @@ cyZ
cAd
ctA
dbr
cCj
QuX
dDC
cCj
QuX
cFU
cCe
ctK
@@ -107824,7 +107851,7 @@ cQK
cQY
cYJ
aaa
cYO
aaa
aaa
aaa
aaa
@@ -113224,15 +113251,15 @@ cRi
cRe
cRi
cSg
cSo
cSn
cSn
cSd
cSg
cSo
cSn
cSn
cSd
cSg
cSo
cSn
cSn
cRi
cTA
@@ -113466,8 +113493,8 @@ cIg
dDF
dvY
cNj
dwN
dwN
ciL
ciL
cPg
dvY
aaa
@@ -113723,8 +113750,8 @@ cIg
dxQ
dvY
cNk
dwN
dwN
ciL
ciL
cPh
dvY
aaa
@@ -114526,7 +114553,7 @@ cTt
daA
cSn
cSn
cSo
cSn
daL
cRi
daQ
@@ -115794,15 +115821,15 @@ dcC
dcM
cSd
cSn
cSo
cSn
cSg
cSd
cSn
cSo
cSn
cSg
cSd
cSn
cSo
cSn
cSg
cRi
ddh
@@ -118320,7 +118347,7 @@ alq
alq
dvY
ckx
dwN
ciL
dwQ
cot
cnb
@@ -118577,10 +118604,10 @@ apc
chE
dvY
cky
dwN
ciL
dwX
dwN
dwN
ciL
ciL
cou
csb
dvY
@@ -118834,10 +118861,10 @@ avr
chF
dvY
ckz
dwN
ciL
dwY
dwN
dwN
ciL
ciL
cgs
csc
dvY
@@ -119095,7 +119122,7 @@ dwQ
cnb
cou
cpK
dwN
ciL
csc
dvY
Qtj
@@ -120324,7 +120351,7 @@ aFs
aGT
axY
aJm
aKy
aJu
aMb
EDE
axY
@@ -146180,3 +146207,4 @@ aaa
aaa
aaa
"}
_maps/map_files/OmegaStation/OmegaStation.dmm
+1 -1
View File
@@ -32602,7 +32602,7 @@
/turf/open/floor/circuit/green/telecomms,
/area/tcommsat/server)
"buP" = (
/obj/machinery/message_server,
/obj/machinery/telecomms/message_server,
/turf/open/floor/circuit/green/telecomms,
/area/tcommsat/server)
"buQ" = (
_maps/map_files/PubbyStation/PubbyStation.dmm
+1 -1
View File
@@ -47489,7 +47489,7 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"cmH" = (
/obj/machinery/message_server,
/obj/machinery/telecomms/message_server,
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"cmI" = (
_maps/map_files/generic/Space2.dmm
+65540
View File
File diff suppressed because it is too large Load Diff
config/admin_nicknames.txt
+2
View File
@@ -0,0 +1,2 @@
Badmin
<span class='adminooc'>Spanmin</span>
config/admin_ranks.txt
+4 -4
View File
@@ -19,7 +19,7 @@
# +BAN = the ability to ban, jobban and fullban
# +STEALTH = the ability to stealthmin (make yourself appear with a fake name to everyone but other admins
# +POSSESS = the ability to possess objects
# +REJUV (or +REJUVINATE) = the ability to heal, respawn, modify damage and use godmode
# +POLL (or +POLL) = the ability to create in game server polls (requires DB)
# +BUILD (or +BUILDMODE) = the ability to use buildmode
# +SERVER = higher-risk admin verbs and abilities, such as those which affect the server configuration.
# +DEBUG = debug tools used for diagnosing and fixing problems. It's useful to give this to coders so they can investigate problems on a live server.
@@ -34,12 +34,12 @@
Admin Observer = -AUTOLOGIN
Moderator = +ADMIN
Admin Candidate = +@
Trial Admin = +@ +SPAWN +REJUV +VAREDIT +BAN
Badmin = +@ +POSSESS +BUILDMODE +SERVER +FUN
Trial Admin = +@ +SPAWN +VAREDIT +BAN
Badmin = +@ +POSSESS +POLL +BUILDMODE +SERVER +FUN
Game Admin = +@ +STEALTH +SOUNDS +DEBUG
Game Master = +EVERYTHING
Lazy Master = +EVERYTHING -AUTOLOGIN
Host = +EVERYTHING
Coder = +DEBUG +VAREDIT +SERVER +SPAWN -AUTOLOGIN
Coder = +DEBUG +VAREDIT +SERVER +SPAWN +POLL -AUTOLOGIN
config/admins.txt
-130
View File
@@ -7,133 +7,3 @@
# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn #
# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. #
###############################################################################################
<<<<<<< HEAD
Jayehh = Host
=======
Optimumtact = Host
NewSta = Game Master
Expletives = Game Master
kingofkosmos = Game Master
MrStonedOne = Lazy Master
microscopics = Game Master
Gun Hog = Game Master
KorPhaeron = Game Master
razharas = Game Master
Lordpidey = Game Master
Niknakflak = Game Master
rolan7 = Game Master
quarxink = Game Master
adrix89 = Game Master
tle = Game Master
xsi = Game Master
scaredofshadows = Game Master
neofite = Game Master
trubblebass = Game Master
mport2004 = Game Master
deuryn = Game Master
agouri = Game Master
errorage = Game Master
superxpdude = Game Master
petethegoat = Game Master
korphaeron = Game Master
nodrak = Game Master
carnwennan = Game Master
ikarrus = Game Master
cheridan = Game Master
giacomand = Game Master
rockdtben = Game Master
sieve = Game Master
aranclanos = Game Master
intigracy = Game Master
dumpdavidson = Game Master
kazeespada = Game Master
malkevin = Game Master
incoming = Game Master
demas = Game Master
fleure = Game Master
ricotez = Game Master
misterperson = Game Master
crimsonvision = Game Master
iamgoofball = Game Master
zelacks = Game Master
androidsfv = Game Master
miggles = Game Master
jordie0608 = Game Master
s0ldi3rkr4s0 = Game Master
ergovisavi = Game Master
vistapowa = Game Master
miauw62 = Game Master
kazeespada = Game Master
rumia29 = Game Master
bobylein = Game Master
sirbayer = Game Master
hornygranny = Game Master
yota = Game Master
firecage = Game Master
donkieyo = Game Master
argoneus = Game Master
paprka = Game Master
cookingboy3 = Game Master
limeliz = Game Master
steelpoint = Game Master
phil235 = Game Master
CorruptComputer = Game Master
xxnoob = Game Master
tkdrg = Game Master
Cuboos = Game Master
thunder12345 = Game Master
wjohnston = Game Master
mandurrh = Game Master
thurgatar = Game Master
xerux = Game Master
dannno = Game Master
lo6a4evskiy = Game Master
vekter = Game Master
Ahammer18 = Game Master
ACCount12 = Game Master
fayrik = Game Master
shadowlight213 = Game Master
drovidicorv = Game Master
Dunc = Game Master
MMMiracles = Game Master
bear1ake = Game Master
CoreOverload = Game Master
Jalleo = Game Master
ChangelingRain = Game Master
FoxPMcCloud = Game Master
Xhuis = Game Master
Astralenigma = Game Master
Tokiko1 = Game Master
SuperSayu = Game Master
Lzimann = Game Master
As334 = Game Master
neersighted = Game Master
Swankcookie = Game Master
Ressler = Game Master
Folix = Game Master
Bawhoppennn = Game Master
Anturke = Host
Lumipharon = Game Master
bgobandit = Game Master
coiax = Game Master
RandomMarine = Game Master
PKPenguin321 = Game Master
TechnoAlchemist = Game Master
Aloraydrel = Game Master
Quiltyquilty = Game Master
SnipeDragon = Game Master
Fjeld = Game Master
kevinz000 = Game Master
Tacolizard = Game Master
TrustyGun = Game Master
Cyberboss = Game Master
PJB3005 = Game Master
Sweaterkittens = Game Master
Feemjmeem = Game Master
JStheguy = Game Master
excessiveuseofcobby = Game Master
Plizzard = Game Master
octareenroon91 = Game Master
Serpentarium = Game Master
>>>>>>> bdfbafd... [READY]integrated circuitry port+upgrade. (#32481)
config/comms.txt
+3 -1
View File
@@ -2,7 +2,9 @@
#COMMS_KEY default_pwd
## World address and port for server recieving cross server messages
#CROSS_SERVER_ADDRESS byond:\\address:port
## Use '+' to denote spaces in ServerName
## Repeat this entry to add more servers
#CROSS_SERVER ServerName byond:\\address:port
## Name that the server calls itself in communications
#CROSS_COMMS_NAME
config/config.txt
+10
View File
@@ -62,6 +62,7 @@ BAN_LEGACY_SYSTEM
## Allows admins to bypass job playtime requirements.
#USE_EXP_RESTRICTIONS_ADMIN_BYPASS
## log OOC channel
LOG_OOC
@@ -123,6 +124,9 @@ LOG_MANIFEST
## Comment this out to stop admins being able to choose their personal ooccolor
ALLOW_ADMIN_OOCCOLOR
## Job slot open/close by identification consoles delay in seconds
ID_CONSOLE_JOBSLOT_DELAY 30
## If metadata is supported
ALLOW_METADATA
@@ -253,6 +257,12 @@ TICKLAG 0.5
## Uncomment this to let players see their own notes (they can still be set by admins only)
#SEE_OWN_NOTES
### Comment these two out to prevent notes fading out over time for admins.
## Notes older then this will start fading out.
NOTE_FRESH_DAYS 91.31055
## Notes older then this will be completely faded out.
NOTE_STALE_DAYS 365.2422
##Note: all population caps can be used with each other if desired.
## Uncomment for 'soft' population caps, players will be warned while joining if the living crew exceeds the listed number.
config/game_options.txt
+16 -26
View File
@@ -61,7 +61,7 @@ ANIMAL_DELAY 1
ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.
ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.
ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.
ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised. Additionally, access requirements on some doors have been lifted.
ALERT_RED_DOWNTO The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised.
ALERT_DELTA Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
@@ -112,12 +112,6 @@ CONTINUOUS CULT
CONTINUOUS CLOCKWORK_CULT
CONTINUOUS CHANGELING
CONTINUOUS WIZARD
<<<<<<< HEAD
CONTINUOUS BLOB
CONTINUOUS ABDUCTION
#CONTINUOUS RAGINMAGES
=======
>>>>>>> e38e6b8... Antag Panel / Check antagonists Refactor (#34236)
#CONTINUOUS MONKEY
##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately!
@@ -140,12 +134,6 @@ MIDROUND_ANTAG CULT
MIDROUND_ANTAG CLOCKWORK_CULT
MIDROUND_ANTAG CHANGELING
MIDROUND_ANTAG WIZARD
<<<<<<< HEAD
MIDROUND_ANTAG BLOB
MIDROUND_ANTAG ABDUCTION
#MIDROUND_ANTAG RAGINMAGES
=======
>>>>>>> e38e6b8... Antag Panel / Check antagonists Refactor (#34236)
#MIDROUND_ANTAG MONKEY
## Uncomment these for overrides of the minimum / maximum number of players in a round type.
@@ -388,27 +376,17 @@ LAW_WEIGHT buildawall,0
## Attempting to upload laws past this point will fail unless the AI is reset
SILICON_MAX_LAW_AMOUNT 12
## Uncomment to give players the choice of their species before they join the game
JOIN_WITH_MUTANT_RACE
## Roundstart Races
##-------------------------------------------------------------------------------------------
## Uncommenting races will allow them to be choosen at roundstart while join_with_muntant_race is on. You'll need at least one.
## You probably want humans on your space station, but technically speaking you can turn them off without any ill effect
ROUNDSTART_RACES human
ROUNDSTART_RACES mammal
ROUNDSTART_RACES avian
ROUNDSTART_RACES aquatic
ROUNDSTART_RACES insect
ROUNDSTART_RACES xeno
ROUNDSTART_RACES datashark
ROUNDSTART_RACES guilmon
## Races that are strictly worse than humans that could probably be turned on without balance concerns
ROUNDSTART_RACES lizard
#ROUNDSTART_RACES fly
#ROUNDSTART_RACES moth
ROUNDSTART_RACES plasmaman
#ROUNDSTART_RACES shadow
@@ -507,6 +485,18 @@ MICE_ROUNDSTART 10
## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be)
#EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2
## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING
## CITADEL Races
ROUNDSTART_RACES mammal
ROUNDSTART_RACES avian
ROUNDSTART_RACES aquatic
ROUNDSTART_RACES insect
ROUNDSTART_RACES xeno
ROUNDSTART_RACES datashark
ROUNDSTART_RACES guilmon
## CREW OBJECTIVES ##
## Comment to disable objectives for innocent crew members.
ALLOW_CREW_OBJECTIVES
@@ -518,5 +508,5 @@ ALLOW_MISCREANTS
## Uncomment to let miscreants spawn during Extended. I hold no responsibility for fun that may occur while this is enabled.
#ALLOW_EXTENDED_MISCREANTS
## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING
## Uncomment to give players the choice of their species before they join the game
JOIN_WITH_MUTANT_RACE
config/maps.txt
+5 -1
View File
@@ -10,9 +10,10 @@ Format:
maxplayers [number] (0 or less disables this requirement)
default (The last map with this defined will get all votes of players who have not explicitly voted for a map)
voteweight [number] (How much to count each player vote as, defaults to 1, setting to 0.5 counts each vote as half a vote, 2 as double, etc, Setting to 0 disables the map but allows players to still pick it)
disabled (disables the map)
endmap
map tgstation2
map boxstation
default
#voteweight 1.5
endmap
@@ -32,3 +33,6 @@ endmap
map deltastation
minplayers 50
endmap
map runtimestation
endmap
config/policies.txt
+5
View File
@@ -0,0 +1,5 @@
## SERVER POLICIES ##
# Each line is pure html that gets sent to the user under certain conditions
# When a mob is polymorphed
POLYMORPH <span class='danger'>Note that you are allowed to act as an antagonist while transformed into a hostile mob, unless you volunteered for or sought out transformation.</span>
config/spaceRuinBlacklist.txt
+2 -1
View File
@@ -18,6 +18,7 @@
#_maps/RandomRuins/SpaceRuins/derelict6.dmm
#_maps/RandomRuins/SpaceRuins/spacebar.dmm
#_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
#_maps/RandomRuins/SpaceRuins/deepstorage.dmm
#_maps/RandomRuins/SpaceRuins/emptyshell.dmm
#_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
#_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
@@ -40,5 +41,5 @@
#_maps/RandomRuins/SpaceRuins/vaporwave.dmm
#_maps/RandomRuins/SpaceRuins/bus.dmm
#_maps/RandomRuins/SpaceRuins/miracle.dmm
#_maps/RandomRuins/SpaceRuins/dragoontomb.dmm
#_maps/RandomRuins/SpaceRuins/oldstation.dmm
#_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm
strings/clockwork_cult_changelog.txt
+1 -6
View File
@@ -1,6 +1 @@
When revived by a vitality matrix, servants will gain a 1-minute debuff that prevents revival again.
Vitality matrices must now be placed at least one tile apart.
Servants are now teleported to and locked on Reebe once the Ark starts.
Cyborgs are now damaged by brass skewers.
Vitality matrices no longer work on buckled mobs (including skewered ones.)
Pressure sensors have much less health.
Stargazers have been removed. Integration cogs are now the primary way of creating power.
tgui/assets/tgui.js
+2 -2
View File
File diff suppressed because one or more lines are too long
tgui/package-lock.json
Generated
+2108
View File
File diff suppressed because it is too large Load Diff
tgui/src/interfaces/slime_swap_body.ract
+9 -1
View File
@@ -7,7 +7,15 @@
<ui-button
state='{{swap_button_state}}'
action='swap' params='{"ref": "{{ref}}"}'>
{{is_current ? "You Are Here" : "Swap"}}
{{#if occupied == "owner"}}
You Are Here
{{else}}
{{#if occupied == "stranger"}}
Occupied
{{else}}
Swap
{{/if}}
{{/if}}
</ui-button>
</ui-section>
tools/Runtime Condenser/RuntimeCondenser.exe
BIN
View File
Binary file not shown.