shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,900 Commits 5 Branches 0 Tags
7b157a9a6ae0417cd46bbac29b462d892b71c2fe
Commit Graph

3497 Commits

Author SHA1 Message Date
LetterJay
7b157a9a6a Update datumvars.dm 2017-09-11 14:23:15 -05:00
LetterJay
7cdd5eaa02 Update admin.dm 2017-09-11 14:22:23 -05:00
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
CitadelStationBot
d35717e1ab [MIRROR] Fixes assault pod blinking docking effects (#2667) 
* Fixes assault pod blinking docking effects (#30492)

* Fixes assault pod blinking docking effects
 2017-09-08 20:15:10 -05:00
Poojawa
ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654) 
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
 2017-09-08 06:58:08 -05:00
Poojawa
50cd75df7d Actually makes Citadel reagents process (#2653) 2017-09-08 06:55:19 -05:00
LetterJay
a806ecad19 Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486 
[MIRROR] Fixes goliath butchering
 2017-09-07 15:57:03 -05:00
LetterJay
d5c4f6e62d Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451 
[MIRROR] Disablers and ions wont burn plasma statues statues
 2017-09-07 15:55:04 -05:00
LetterJay
93a98c000b Merge pull request #2648 from Citadel-Station-13/upstream-merge-30460 
[MIRROR] You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
 2017-09-07 15:54:49 -05:00
LetterJay
217e077342 Merge pull request #2645 from Citadel-Station-13/upstream-merge-30469 
[MIRROR] Fixes containment field CanPass
 2017-09-07 15:54:34 -05:00
LetterJay
82cfa67581 Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233 
[MIRROR] Adds a message when trying to move while buckled
 2017-09-07 15:53:38 -05:00
LetterJay
ff219f365e Update goliath.dm (#30486) 2017-09-07 11:58:42 -05:00
KorPhaeron
b172025e96 Disablers and ions wont burn statues 2017-09-07 10:34:44 -05:00
ExcessiveUseOfCobblestone
b6eddd8845 ok 2017-09-07 10:34:36 -05:00
AnturK
df3b4c10bc Fixes containment field CanPass 2017-09-07 10:34:11 -05:00
LetterJay
c55ac69e4a Merge pull request #2634 from Citadel-Station-13/upstream-merge-30458 
[MIRROR] Allows atmos techs to download the SM monitor
 2017-09-07 10:23:15 -05:00
LetterJay
21a72cd04c Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436 
[MIRROR] More timer debugging for the debug gods.
 2017-09-07 10:22:45 -05:00
LetterJay
9ca0d6588d Merge pull request #2642 from Citadel-Station-13/upstream-merge-30400 
[MIRROR] Adds a unique suicide to the hierophant club, plus some attack verbs
 2017-09-07 10:22:17 -05:00
LetterJay
8d854a53d8 Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426 
[MIRROR] Fixes swarmers breaking the SM's containment
 2017-09-07 10:21:57 -05:00
kingofkosmos
dd27a1850a Adds a message when trying to move while buckled 2017-09-07 10:12:32 -05:00
Ashe Higgs
938c10ad1c Adds a unique suicide to the hierophant club, plus some attack verbs (#30400) 
* Adds a suicide to the hierophant club

* Above

* good point

* Removes the delay
 2017-09-07 10:01:55 -05:00
LetterJay
31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
Kyle Spier-Swenson
4b02f01a66 More timer debugging for the debug gods. (#30436) 
* More timer debugging for the debug gods.

* Its times like this I wish I could amend commit from the web interface

* git commit -a -amend&&git push --force
 2017-09-07 09:59:28 -05:00
LetterJay
8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay
eee21d496d oops 2017-09-07 07:23:52 -05:00
LetterJay
2ec925f66b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-07 07:21:56 -05:00
LetterJay
b5d80219ac donation item 2017-09-07 07:21:42 -05:00
LetterJay
1162edad65 Merge pull request #2632 from Citadel-Station-13/upstream-merge-30452 
[MIRROR] Alters the pressure plate crafting recipe
 2017-09-07 06:26:51 -05:00
ShizCalev
7fb4426011 Fixes swarmers breaking the SM's containment (#30426) 
* Fixes swamers breaking the SM

* Switched checks to use get_area
 2017-09-07 05:17:51 -05:00
LetterJay
5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176 
[MIRROR] Adds more round id tracking
 2017-09-06 21:31:28 -05:00
ShizCalev
4282d82e33 Allows atmos techs to download the SM monitor (#30458) 2017-09-06 21:00:25 -05:00
Anonmare
ee41b3da6f Alters the pressure plate crafting recipe (#30452) 2017-09-06 20:35:50 -05:00
LetterJay
3efa1d6134 Merge pull request #2631 from Citadel-Station-13/upstream-merge-30416 
[MIRROR] Adds "shiny" variants of lavaland mobs
 2017-09-06 20:18:27 -05:00
Ashe Higgs
dcd0fa67f0 Adds "shiny" variants of lavaland mobs (#30416) 
* Shiny lavaland mobs!

* Changes based on feedback
 2017-09-06 19:15:25 -05:00
ShizCalev
849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
LetterJay
2f3f56352c Merge branch 'master' into upstream-merge-30176 2017-09-06 17:43:07 -05:00
LetterJay
9265694418 Update _compile_options.dm 2017-09-06 17:41:02 -05:00
LetterJay
f9ef2bb068 commit 2017-09-06 17:36:32 -05:00
LetterJay
17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
LetterJay
bbab9d8d5a donation 2017-09-06 14:41:35 -05:00
LetterJay
a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953 
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
 2017-09-06 10:11:16 -05:00
LetterJay
4ed411d353 Merge pull request #2462 from Citadel-Station-13/upstream-merge-30079 
[MIRROR] Fixes missing inhands
 2017-09-06 10:11:08 -05:00
LetterJay
d4f018952e Merge pull request #2440 from Citadel-Station-13/upstream-merge-29866 
[MIRROR] You can now click on symptoms in the Pandemic to see their description and stats
 2017-09-06 10:10:58 -05:00
LetterJay
82f36f0d28 Delete client_procs.dm.rej 2017-09-06 09:27:57 -05:00
LetterJay
ce1e5c69dc Delete blackbox.dm.rej 2017-09-06 09:27:55 -05:00
LetterJay
b07ebeed57 Merge pull request #2480 from Citadel-Station-13/upstream-merge-30140 
[MIRROR] Corrects column name
 2017-09-06 09:26:12 -05:00
LetterJay
24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJay
b2d7ee0e51 Merge pull request #2537 from Citadel-Station-13/upstream-merge-30248 
[MIRROR] Changes sql version to check for schema being ahead
 2017-09-06 09:23:02 -05:00
LetterJay
ea10c4402e Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027 
[MIRROR] Fixes hair sticking out of spess helmets
 2017-09-06 09:22:44 -05:00
LetterJay
00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00