Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
1fddfde
Fixed comment on admins.txt mentioning character stripping that no lo…
adamsong Sep 11, 2021
881a30e
Automatic changelog generation #12282 [ci skip]
Yogbot-13 Sep 11, 2021
09c5bed
Adds council (#12283)
alexkar598 Sep 11, 2021
d43529d
Automatic changelog compile [ci skip]
actions-user Sep 11, 2021
ec5a7d6
Duffffffffffffffffffffffels (#12289)
JamieD1 Sep 11, 2021
41a09f4
Automatic changelog generation #12289 [ci skip]
Yogbot-13 Sep 11, 2021
2619175
Ports wounds from TG (#11955)
SomeguyManperson Sep 11, 2021
f16859f
Automatic changelog generation #11955 [ci skip]
Yogbot-13 Sep 11, 2021
fff5179
*oil rig explodes* (#12235)
nesisknesis Sep 11, 2021
20c0b96
Automatic changelog generation #12235 [ci skip]
Yogbot-13 Sep 11, 2021
6b9bcb8
Update ai_laws.dm (#12263)
Bibby0110 Sep 11, 2021
f7848bd
fixes seed exports (#12274)
SomeguyManperson Sep 11, 2021
5951f81
Automatic changelog generation #12274 [ci skip]
Yogbot-13 Sep 11, 2021
3607466
rarity schmarity (#12275)
Chubbygummibear Sep 11, 2021
c1c1162
Automatic changelog generation #12275 [ci skip]
Yogbot-13 Sep 11, 2021
e72c5b7
removes second define (#12278)
azzzertyy Sep 11, 2021
06ad002
Automatic changelog generation #12278 [ci skip]
Yogbot-13 Sep 11, 2021
4547d27
gives nicotine free cigarettes a expanded description to make more se…
boodaliboo Sep 11, 2021
494d3b1
Automatic changelog generation #12271 [ci skip]
Yogbot-13 Sep 11, 2021
467282c
Automatic changelog compile [ci skip]
actions-user Sep 11, 2021
ba6d58c
Automatic changelog compile [ci skip]
actions-user Sep 12, 2021
6c7f0ba
adds click catcher (#12296)
nesisknesis Sep 12, 2021
2848aa6
Automatic changelog generation #12296 [ci skip]
Yogbot-13 Sep 12, 2021
ebcfc40
Yeets Council
JamieD1 Sep 12, 2021
a84fc6f
Automatic changelog compile [ci skip]
actions-user Sep 13, 2021
d8091db
Automatic changelog compile [ci skip]
actions-user Sep 15, 2021
9a3cef9
Fixed the filling in vials (#12305)
nmajask Sep 15, 2021
000878a
Automatic changelog generation #12305 [ci skip]
Yogbot-13 Sep 15, 2021
d965f66
Adds 2 new names to the Space Ninja naming list. (#12295)
nesisknesis Sep 15, 2021
8b6eaa3
Automatic changelog generation #12295 [ci skip]
Yogbot-13 Sep 15, 2021
aa8d559
PROPER UNITS (#12308)
Mqiib Sep 15, 2021
96595aa
Automatic changelog generation #12308 [ci skip]
Yogbot-13 Sep 15, 2021
42af4db
Fixed typo in burn healing surgery (#12300)
adamsong Sep 15, 2021
0d0aef0
Automatic changelog generation #12300 [ci skip]
Yogbot-13 Sep 15, 2021
00fdea5
Update revival.dm (#12309)
boodaliboo Sep 15, 2021
a182909
Automatic changelog generation #12309 [ci skip]
Yogbot-13 Sep 15, 2021
575c34c
Automatic changelog compile [ci skip]
actions-user Sep 15, 2021
1cfa95d
Update CONTRIBUTING.md (#12306)
Bibby0110 Sep 16, 2021
b6dca14
Adds an href token to the mob spawn VV link (#12294)
adamsong Sep 16, 2021
296560f
Automatic changelog generation #12294 [ci skip]
Yogbot-13 Sep 16, 2021
34cec32
Adds Wall Rechargers (#12307)
JamieD1 Sep 16, 2021
548295c
Automatic changelog generation #12307 [ci skip]
Yogbot-13 Sep 16, 2021
05b3c7b
Update AutoChangelog-pr-12307.yml
JamieD1 Sep 16, 2021
0fbff7e
Automatic changelog compile [ci skip]
actions-user Sep 17, 2021
8918b40
Doing a major TEG rework because the current one is a mess that break…
Lostlarry Sep 17, 2021
4ab7fab
Automatic changelog generation #11864 [ci skip]
Yogbot-13 Sep 17, 2021
55c1d93
Ports Turnstiles from NSV13 (or beestation no clue where they came fr…
maxion12345 Sep 17, 2021
43cd0c2
Automatic changelog generation #12105 [ci skip]
Yogbot-13 Sep 17, 2021
769bbc6
Fix floodlights not turning off when out of power, and fixes sling ve…
adamsong Sep 17, 2021
3b63dff
Automatic changelog generation #12222 [ci skip]
Yogbot-13 Sep 17, 2021
3baeaeb
Steals tg's span macros (#12232)
adamsong Sep 17, 2021
9b3b4dd
Lists inside of lists.. (#12273)
Sep 17, 2021
856b06f
Automatic changelog generation #12273 [ci skip]
Yogbot-13 Sep 17, 2021
ba0e06b
Extends AI core power zones over the cameras to make repairing the ca…
Darthkill Sep 17, 2021
266a479
Automatic changelog generation #12281 [ci skip]
Yogbot-13 Sep 17, 2021
c57fa5a
Kills off price elasticity and buffs several exports because I hate b…
SomeguyManperson Sep 17, 2021
95a45ba
Automatic changelog generation #12288 [ci skip]
Yogbot-13 Sep 17, 2021
5b2396d
Adds a fallback if the bar selection is null, along with plenty of ad…
adamsong Sep 17, 2021
3061cc1
Automatic changelog generation #12297 [ci skip]
Yogbot-13 Sep 17, 2021
c399534
Stops adding 'Random' to the list of bars, also makes the cancel butt…
adamsong Sep 17, 2021
1fdb253
Automatic changelog generation #12298 [ci skip]
Yogbot-13 Sep 17, 2021
8b5f7f3
adds a cap on throwspeed from monstermos to carbons so you probably w…
SomeguyManperson Sep 17, 2021
2e4fd4b
Automatic changelog generation #12302 [ci skip]
Yogbot-13 Sep 17, 2021
fa452c2
I did a thing (#12316)
nmajask Sep 17, 2021
4d00494
Automatic changelog generation #12316 [ci skip]
Yogbot-13 Sep 17, 2021
a0704b9
[admin] Revamp auto deadmin (#12286)
adamsong Sep 17, 2021
2a06075
Automatic changelog generation #12286 [ci skip]
Yogbot-13 Sep 17, 2021
68116ff
Round End Sounds start on "Rebooting in 10 Seconds now" (#12292)
JamieD1 Sep 17, 2021
2d0816b
Automatic changelog generation #12292 [ci skip]
Yogbot-13 Sep 17, 2021
3c4e648
Allow mods to soft reboot the server, also allows admins to reboot th…
adamsong Sep 17, 2021
7fdfffd
Automatic changelog generation #12299 [ci skip]
Yogbot-13 Sep 17, 2021
b2b326d
Update turdis.yml
JamieD1 Sep 17, 2021
970a7ea
Automatic changelog compile [ci skip]
actions-user Sep 17, 2021
0c4c9be
Automatic changelog compile [ci skip]
actions-user Sep 19, 2021
bfcfa5e
Update recharger.dm
JamieD1 Sep 19, 2021
7d57a20
Signal-Skill-Cape update! *BzZzZT* (#12311)
KillerOrcaCora Sep 20, 2021
d611508
Automatic changelog generation #12311 [ci skip]
Yogbot-13 Sep 20, 2021
ccf095d
Sheltered nerf (#12325)
Anvilman6 Sep 20, 2021
d95a53c
Automatic changelog generation #12325 [ci skip]
Yogbot-13 Sep 20, 2021
8d3ca92
Replaces the freezers with blood in it with blood freezers (#12276)
nmajask Sep 20, 2021
62d23ae
Automatic changelog generation #12276 [ci skip]
Yogbot-13 Sep 20, 2021
265c59a
Automatic changelog compile [ci skip]
actions-user Sep 21, 2021
3cde30a
Automatic changelog compile [ci skip]
actions-user Sep 23, 2021
e0723f1
should fix a minor bone fixing issue (#12351)
SomeguyManperson Sep 23, 2021
6974a40
Automatic changelog generation #12351 [ci skip]
Yogbot-13 Sep 23, 2021
8a03fe0
Revert TEG Heater because PR 11864 (#12341)
Aquizit Sep 23, 2021
6d9c2a4
quick fix (#12348)
maxion12345 Sep 23, 2021
c9f32a9
Automatic changelog generation #12348 [ci skip]
Yogbot-13 Sep 23, 2021
00875d7
help it broken (#12265)
ToasterBiome Sep 23, 2021
0cc7e90
Automatic changelog generation #12265 [ci skip]
Yogbot-13 Sep 23, 2021
0ecb8b4
Fixes a mapping error in meta maint that I probably did on accident (…
N3D6 Sep 23, 2021
2b17582
Automatic changelog generation #12344 [ci skip]
Yogbot-13 Sep 23, 2021
bcaaa8e
Removed a pixel (#12356)
nmajask Sep 23, 2021
f9686f7
Automatic changelog generation #12356 [ci skip]
Yogbot-13 Sep 23, 2021
8128dc4
Update pandemic.dm (#12361)
Bibby0110 Sep 23, 2021
1f1ac7e
Automatic changelog generation #12361 [ci skip]
Yogbot-13 Sep 23, 2021
6f4b430
Revert "Update pandemic.dm (#12361)"
Bibby0110 Sep 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ There is no strict process when it comes to merging pull requests. Pull requests

* You are going to be expected to document all your changes in the pull request. Failing to do so will mean delaying it as we will have to question why you made the change. On the other hand, you can speed up the process by making the pull request readable and easy to understand, with diagrams or before/after data.

* We ask that you use the changelog system to document your change, which prevents our players from being caught unaware by changes - you can find more information about this [on this wiki page](http://tgstation13.org/wiki/Guide_to_Changelogs).
* We ask that you use the changelog system to document your player facing changes, which prevents our players from being caught unaware by said changes - you can find more information about this [on this wiki page](http://tgstation13.org/wiki/Guide_to_Changelogs).

* If you are proposing multiple changes, which change many different aspects of the code, you are expected to section them off into different pull requests in order to make it easier to review them and to deny/accept the changes that are deemed acceptable.

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/turdis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: Turdis
# events but only for the master branch
on:
pull_request:
branches: master
branches: [master, beta]
push:
branches: master
branches: [master, beta]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
48 changes: 17 additions & 31 deletions _maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -462,14 +462,9 @@
},
/turf/template_noop,
/area/space/nearstation)
"ms" = (
/obj/machinery/atmospherics/components/unary/thermomachine/heater,
/obj/machinery/camera{
c_tag = "Engineering TEG Fore";
network = list("ss13","engine");
pixel_x = 23
},
/obj/effect/turf_decal/stripes/line{
"mp" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 1
},
/turf/open/floor/engine,
Expand Down Expand Up @@ -550,21 +545,6 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
/turf/open/floor/engine,
/area/engine/engineering)
"oW" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 1
},
/turf/open/floor/engine,
/area/engine/engineering)
"pq" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
Expand Down Expand Up @@ -1394,11 +1374,6 @@
dir = 4
},
/area/engine/engineering)
"Ow" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold4w/orange/visible,
/turf/open/floor/engine,
/area/engine/engineering)
"OB" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
Expand Down Expand Up @@ -1690,6 +1665,17 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"Wn" = (
/obj/machinery/camera{
c_tag = "Engineering TEG Fore";
network = list("ss13","engine");
pixel_x = 23
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/engine/engineering)
"Ws" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
Expand Down Expand Up @@ -2346,9 +2332,9 @@ dG
"}
(20,1,1) = {"
ad
ms
oW
Ow
Wn
bC
mp
EE
PV
pP
Expand Down
Loading