shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,016 Commits 5 Branches 0 Tags
7402fab19ec7abc783e1ae8d5b58880fe089bd4e
Commit Graph

3207 Commits

Author SHA1 Message Date
LetterJay
7402fab19e Merge pull request #3650 from Citadel-Station-13/upstream-merge-32137 
[MIRROR] Remove some unneeded null checks in lighting
 2017-10-29 03:46:05 -04:00
LetterJay
5f9a76c6dd Merge pull request #3644 from Citadel-Station-13/upstream-merge-32009 
[MIRROR] Add a safety check to buildmode, also fix a bug with corner selection
 2017-10-29 03:45:06 -04:00
LetterJay
c62f6ec353 Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093 
[MIRROR] Roundstart species pref fixes/removes redundant species config
 2017-10-29 03:41:59 -04:00
LetterJay
a595bee5af Update preferences.dm 2017-10-29 01:58:33 -05:00
LetterJay
95023664dd Update preferences.dm 2017-10-29 01:53:35 -05:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJay
f77b66ebb9 Update preferences.dm 2017-10-29 01:40:28 -05:00
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJay
debaad2948 Update podpeople.dm 2017-10-29 00:47:47 -05:00
LetterJay
d4e794eef7 Update furrypeople.dm 2017-10-29 00:47:25 -05:00
LetterJay
180e730be9 Update species.dm 2017-10-29 00:46:15 -05:00
LetterJay
78da30ec8d Update species.dm 2017-10-29 00:25:17 -05:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
LetterJay
c64446962d Merge branch 'master' into upstream-merge-32096 2017-10-28 03:47:08 -04:00
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
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
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