shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,311 Commits 5 Branches 0 Tags
d2d9cd7fc2a80bc7d4e4e8a7f4df2c5fdf5149e0
Commit Graph

3956 Commits

Author SHA1 Message Date
LetterJay
6172cd38bd Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087 
[MIRROR] Halloween Tweaks
 2017-10-28 03:16:43 -04:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJay
79d6f42dfd conflicts 2017-10-28 01:16:26 -05:00
LetterJay
5dbcbf5689 Update podpeople.dm 2017-10-28 00:23:30 -05:00
LetterJay
12fa1e3ece Update preferences_savefile.dm 2017-10-27 23:54:51 -05:00
Jordan Brown
82c388b3e8 Makes thermite a component 2017-10-27 17:36:38 -05:00
oranges
c00c1dcc00 Merge pull request #32127 from tgstation/Cyberboss-patch-3 
[s] Blocks world proc calls
 2017-10-27 17:35:20 -05:00
Jordan Brown
fde6a94202 Merge pull request #32112 from KorPhaeron/mummies 
"Mummies" (cloth golems) for Halloween
 2017-10-27 17:33:52 -05:00
Jordan Brown
1d8184e206 Merge pull request #32142 from optimumtact/boiwhatarethose 
Remove stray parent proc call in collector code
 2017-10-27 17:31:19 -05:00
Anonmare
79e69cbd36 Adds some new grindables to the grinder (#32107) 
* Adds some new grindables to the grinder

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Adds the extra ")"

* Update reagentgrinder.dm
 2017-10-27 17:30:08 -05:00
Jordan Brown
8c194d8947 Merge pull request #32137 from MrStonedOne/patch-441 
Remove some unneeded null checks in lighting
 2017-10-27 17:28:52 -05:00
LetterJay
fb5863ba35 Merge pull request #3630 from deathride58/adminhelphandlebutton 
Adds a "Handle Issue" button to ahelps
 2017-10-27 16:33:21 -04:00
LetterJay
39f683ab8d Update meteor_wave.dm 2017-10-27 15:32:38 -05:00
LetterJay
12d336cbf0 Update halloween.dm 2017-10-27 15:32:15 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
JamieH
7811507f1a Add a safety check to buildmode, also fix a bug with corner selection (#32009) 
* Update buildmode.dm

* Add files via upload

* Update buildmode.dm

* Update buildmode.dm
 2017-10-27 04:51:58 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
LetterJay
9599dd94c0 Merge pull request #3634 from deathride58/voreproctovoreverb 
Readds the hook necessary for vore setup
 2017-10-27 03:15:22 -04:00
LetterJay
7f6b1a6400 Merge pull request #3637 from deathride58/loocerrorfix 
Fixes LOOC error messages not appearing in goonchat
 2017-10-27 02:48:16 -04:00
LetterJay
141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791 
[MIRROR] Assmos part 1, #2
 2017-10-27 02:47:56 -04:00
LetterJay
4ab8e0d8f1 Merge pull request #3625 from Citadel-Station-13/upstream-merge-31987 
[MIRROR] Inlines and optimizes compile_overlays
 2017-10-27 02:44:48 -04:00
LetterJay
9a1db237d2 Merge pull request #3618 from Citadel-Station-13/upstream-merge-32058 
[MIRROR] Fixes lightgeist spawning
 2017-10-27 02:18:48 -04:00
LetterJay
3202baec26 Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075 
[MIRROR] Makes staff of change randomly assign a borg module
 2017-10-27 02:17:45 -04:00
LetterJay
4fee09e236 Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098 
[MIRROR] Fixes a runtime on organ replacement
 2017-10-27 02:16:47 -04:00
LetterJay
6b0bb7268e Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945 
[MIRROR] Adds ambience to the SM and portable generators
 2017-10-27 02:16:02 -04:00
LetterJay
49fa09d1bd Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944 
[MIRROR] Atmos construction rework again
 2017-10-27 02:00:11 -04:00
LetterJay
4facc9c04e Update pump.dm 2017-10-27 00:23:13 -05:00
LetterJay
2b699d8d73 Update volume_pump.dm 2017-10-27 00:05:28 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
LetterJay
646ddb9bc2 Merge pull request #3609 from Citadel-Station-13/upstream-merge-32089 
[MIRROR] Fixes light source qdel issues.
 2017-10-26 16:54:17 -04:00
LetterJay
bdeaa6e886 Merge pull request #3607 from Citadel-Station-13/upstream-merge-32076 
[MIRROR] Fixes SoC creating braindead aliens
 2017-10-26 16:53:40 -04:00
LetterJay
4cc0cf3ee7 Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972 
[MIRROR] Greyscale cables
 2017-10-26 16:53:08 -04:00
LetterJay
1ecd723475 Merge pull request #3597 from Citadel-Station-13/upstream-merge-32071 
[MIRROR] Fixes heartbeat message spam
 2017-10-26 16:50:51 -04:00
deathride58
4fd775ee1d Fixes LOOC error messages not appearing 2017-10-26 16:28:07 -04:00
deathride58
e7c69850a1 Wait shit what am i doing - fixes voreverbs proper 2017-10-26 14:31:55 -04:00
deathride58
1770341ee3 converts vore verbs to actual verbs 2017-10-26 13:56:10 -04:00
KorPhaeron
ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
KorPhaeron
9f7a7bcc22 Vampire species for halloween 2017-10-26 11:55:40 -05:00
deathride58
55cad46845 Adds a button to let people ahelping know their issue is being handled 2017-10-26 12:21:28 -04:00
KorPhaeron
00163837de Halloween Tweaks 2017-10-26 05:20:53 -05:00
oranges
c3dbb8925b Merge pull request #31987 from Cyberboss/InlineCO 
May as well shave some yaks
 2017-10-26 05:05:09 -05:00
ShizCalev
c016e1e830 Fixes lightgeist spawning 2017-10-25 23:43:20 -05:00
ShizCalev
6fc3da14d4 Makes staff of change randomly assign a borg module 2017-10-25 23:39:48 -05:00
ACCount
1c1f39d1d3 Fixes a runtime on organ replacement 2017-10-25 23:38:31 -05:00
Emmett Gaines
c7d3696636 Adds ambience to the SM and portable generators (#31945) 
* Adds aambience to the SM and portable generators

* lowered pitch of supermatter

* start and end fix
 2017-10-25 23:37:14 -05:00
Kyle Spier-Swenson
671ae577f0 Fixes light source qdel issues. 2017-10-25 23:34:52 -05:00
ShizCalev
7c34440a06 Fixes braindead aliums 2017-10-25 23:32:33 -05:00
Emmett Gaines
ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
CitadelStationBot
f6331eedf8 [MIRROR] Shuttle navigation computers ignore the shuttle when placing a new location (#3596) 
* Shuttle navigation computers ignore the shuttle when placing a new location (#31722)

* Fixed the shuttle navigation computer allowing you to move stationary docking ports

* Made the shuttle navigation computer ignore the shuttle it controls when determining valid turfs

* Removed a redundant list

* Moved a var from stationary docking ports to mobile docking ports

* Removed a sanity check

* Shuttle navigation computers ignore the shuttle when placing a new location
 2017-10-25 20:03:11 -05:00
CitadelStationBot
7ee7942aa4 [MIRROR] [s] Fixes changling golem exploit (#3600) 
* Merge pull request #32061 from ShizCalev/ling-golem-exploit-fix

Fixes changling golem exploit

* [s] Fixes changling golem exploit
 2017-10-25 20:01:52 -05:00