shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,486 Commits 5 Branches 0 Tags
cd38bccf01c586c8d997d1007803cf96cf51e7a1
Commit Graph

765 Commits

Author SHA1 Message Date
deathride58
120457d8fd Merge pull request #6088 from Citadel-Station-13/FixesItAll 
Makes sure the server can never ever crash ever again
 2018-04-08 04:18:37 +00:00
deathride58
832939d3ac Merge pull request #6282 from Citadel-Station-13/upstream-merge-36989 
[MIRROR] Logs the load away mission verb.
 2018-04-08 02:25:25 +00:00
deathride58
1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
deathride58
57f0cc35b5 Update mapping.dm 2018-04-06 20:54:12 -04:00
deathride58
b88da782aa Update job.dm 2018-04-06 20:53:15 -04:00
deathride58
bae5e5c81d Merge pull request #6291 from Citadel-Station-13/upstream-merge-36997 
[MIRROR] Fixes dead chat announcements not using real name.
 2018-04-07 00:49:33 +00:00
Jordan Brown
0ddf202682 Merge pull request #36872 from kevinz000/totally_not_a_feature 
GC debugging features
 2018-04-06 09:17:11 -05:00
Jordan Brown
554ed22603 Merge pull request #36997 from DaxDupont/is-this-real-life 
Fixes dead chat announcements not using real name.
 2018-04-06 09:08:48 -05:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
AnturK
0efb82be90 Logs the load away mission verb. 2018-04-06 00:44:06 -05:00
vuonojenmustaturska
ae61521e67 Merge pull request #36829 from MrStonedOne/onclick_rework 
[s]Minor Refactor of click code, anti-auto clicker protection
 2018-04-01 08:24:12 -05:00
LetterJay
4f032913c7 Merge pull request #6171 from Citadel-Station-13/upstream-merge-36702 
[MIRROR] increases MAX_THROWING_DIST
 2018-03-31 06:21:47 -05:00
LetterJay
bfda01ec9f Merge pull request #6170 from Citadel-Station-13/upstream-merge-36763 
[MIRROR] Capitalizes pathfinder subsystem
 2018-03-31 06:21:29 -05:00
LetterJay
7ce6bc2a62 Merge pull request #6160 from Citadel-Station-13/upstream-merge-36703 
[MIRROR] Restarting the controller no longer resets the config
 2018-03-31 06:19:35 -05:00
LetterJay
018fa05f01 Merge pull request #6155 from Citadel-Station-13/upstream-merge-36554 
[MIRROR] Adds config to allow ranks only from txt
 2018-03-31 06:17:58 -05:00
kachnov
bf699ac9e6 increases MAX_THROWING_DIST (#36702) 
* initial commit

* refactor

* oh that went first
 2018-03-29 05:00:14 -05:00
FrozenGuy5
85ef261c76 Capitalizes pathfinder (#36763) 2018-03-29 04:52:53 -05:00
Jordan Brown
7980b080e3 Restarting the controller no longer resets the config 2018-03-28 13:40:31 -05:00
Jordan Brown
4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
vuonojenmustaturska
6bcd278bb6 Merge pull request #36747 from praisenarsie/patch-36 
Increases monkeycap to 64
 2018-03-28 12:16:06 -05:00
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398 
[MIRROR] [READY]pathfinding circuitry upgrade
 2018-03-27 17:47:11 +00:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398) 
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
 2018-03-26 11:01:22 -05:00
kevinz000
4773743eab Fixes wet floor scaling (#36697) 
* Fixes wet floor scaling

* Meh lets not
 2018-03-26 10:49:42 -05:00
LetterJay
39465f6a88 actual update 2018-03-22 22:53:17 -05:00
LetterJay
a206224aa7 Update shuttle.dm 2018-03-22 22:34:35 -05:00
CitadelStationBot
c96253c376 [MIRROR] Fixes incorrect first death mob name (#6080) 
* Fixes incorrect first death mob name

* Fixes incorrect first death mob name
 2018-03-22 19:32:40 -05:00
CitadelStationBot
80d5cc2884 [MIRROR] Nerfs monkey spam (#6084) 
* Merge pull request #36380 from vuonojenmustaturska/sauerbraten

Nerfs monkey spam

* Nerfs monkey spam
 2018-03-22 19:31:57 -05:00
CitadelStationBot
99487a6bbb [MIRROR] April Fools Day replaces the overflow role with Clowns (#6041) 
* April Fools Day replaces the overflow role with Clowns (#36533)

* Refactors overflow job assignment

* Fixes job selection

* April Fools Day replaces the overflow role with Clowns
 2018-03-21 12:57:30 -05:00
deathride58
0d4e7f73f4 Merge pull request #6031 from Citadel-Station-13/upstream-merge-36466 
[MIRROR] Unit test to make sure all subsystems which initialize call parent
 2018-03-20 15:56:27 +00:00
Emmett Gaines
0832bb62c3 Unit test to make sure all subsystems which initialize call parent 2018-03-20 08:02:17 -05:00
Poojawa
8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014) 
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
 2018-03-19 21:11:23 -05:00
Poojawa
d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
Poojawa
c8365e6be7 Hunts down some runtimes 
cleans up some dogborg sleeper code too
 2018-03-17 19:38:03 -05:00
deathride58
0f5b8c228e Merge pull request #5975 from Citadel-Station-13/upstream-merge-36419 
[MIRROR] Lavaland / Lavaplanet is now visible from space
 2018-03-17 23:50:59 +00:00
Qustinnus
f7a8a96536 Lavaland / Lavaplanet is now visible from space (#36419) 
* adds lava planet

* fixes oldcode

* im dumb

* Random position

* UHHHH, I'll take a diet lavaplanet please, no ice.

* fixes init
 2018-03-17 07:54:21 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130) 
* Wet Floor components

* No more turf wet slide.
 2018-03-17 07:53:11 -05:00
Poojawa
452b58d1a1 makes traits more paranoid, also removes the double application (#5929) 2018-03-14 17:28:42 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBot
a58a8cdefb [MIRROR] Fixes client version config not working (#5935) 
* Merge pull request #36350 from MrStonedOne/patch-490

Fixes client version config not working

* Fixes client version config not working
 2018-03-13 05:45:34 -05:00
CitadelStationBot
c3edb62df9 [MIRROR] Hopefully fixes unnecessary nightshift announcements (#5923) 
* Hopefully fixes unnecessary nightshift announcements (#36173)

* Hopefully fixes unnecessary nightshift announcements
 2018-03-12 07:30:16 -05:00
Jordan Brown
ad6a3e810f Fix config loading exploit (#36286) 2018-03-10 14:52:18 -06:00
CitadelStationBot
e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892) 
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
 2018-03-10 07:43:42 -06:00
CitadelStationBot
93d8756a70 [MIRROR] NAMEOFs some things (#5877) 
* NAMEOFs some things (#36263)

* NAMEOFs some things
 2018-03-10 07:38:37 -06:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
a4751b0e94 Merge pull request #5868 from Citadel-Station-13/upstream-merge-36289 
[MIRROR] [s] Stop qdeling shit you're not supposed to
 2018-03-09 18:39:51 +00:00
deathride58
8728d99ef9 Merge pull request #5866 from Citadel-Station-13/upstream-merge-36287 
[MIRROR] [S] Fixes GLOB protected vars exploit
 2018-03-09 18:39:19 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer 
Reverts crybaby inducer also does the sync things
 2018-03-09 18:36:42 +00:00
vuonojenmustaturska
ba5b5b433e Merge pull request #36289 from tgstation/Cyberboss-patch-4 
[s] Stop qdeling shit you're not supposed to
 2018-03-09 10:44:46 -06:00
vuonojenmustaturska
27928bb1bf Merge pull request #36287 from tgstation/Cyberboss-patch-4 
[S] Fixes GLOB protected vars exploit
 2018-03-09 09:07:35 -06:00