shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,351 Commits 5 Branches 0 Tags
ea0dd3987fe3ccbdf02a3250543dac9fe995642f
Commit Graph

2425 Commits

Author SHA1 Message Date
LetterJay
ea0dd3987f Merge pull request #1835 from Citadel-Station-13/upstream-merge-28920 
[MIRROR] Fix IRC server check
 2017-06-30 09:55:53 -05:00
LetterJay
80ed0871c0 Merge pull request #1834 from Citadel-Station-13/upstream-merge-28919 
[MIRROR] Makes the status throttle much more sane.
 2017-06-30 09:55:16 -05:00
CitadelStationBot
cea4ef905e Tweaks how ash drake shadows look at the beginning and end of swoops 2017-06-30 09:20:24 -05:00
CitadelStationBot
33c620d580 Fix IRC server check 2017-06-30 09:09:02 -05:00
CitadelStationBot
351511db3b Makes the status throttle much more sane. 2017-06-30 07:52:33 -05:00
LetterJay
881acdbecc Merge pull request #1833 from Citadel-Station-13/upstream-merge-28918 
[MIRROR] Makes IRC pm use ckey() on target
 2017-06-30 00:04:51 -05:00
LetterJay
5ac8e01f3b should fix file extension issue with logs 2017-06-29 22:27:51 -05:00
CitadelStationBot
2312e89503 Makes IRC pm use ckey() on target 2017-06-29 22:22:21 -05:00
CitadelStationBot
6f67132f27 Fixes ninjas not getting their katana (#1831) 2017-06-29 18:59:13 -07:00
CitadelStationBot
8edba7b74b [s] Holodeck exploit fix (#1830) 2017-06-29 18:59:04 -07:00
LetterJay
5d220ca7cd Merge pull request #1808 from Citadel-Station-13/upstream-merge-28870 
[MIRROR] Fixes emergency shuttle endgame state
 2017-06-29 05:58:11 -05:00
LetterJay
8404651a82 Update shuttles.dm 2017-06-29 05:28:34 -05:00
LetterJay
1c9a15f74d Update emergency.dm 2017-06-29 05:07:12 -05:00
LetterJay
5965f220c0 Merge pull request #1810 from Citadel-Station-13/upstream-merge-28635 
[MIRROR] Ports bay's supermatter monitor modular program
 2017-06-29 04:47:17 -05:00
LetterJay
8cd84f7496 Update emergency.dm 2017-06-29 04:44:26 -05:00
LetterJay
82f33ca772 Update sm_monitor.dm 2017-06-29 04:35:35 -05:00
CitadelStationBot
fbb0378072 Updates blender descriptions (#1660) 2017-06-28 22:14:40 -07:00
LetterJay
5c9f09dc07 Merge pull request #1807 from Citadel-Station-13/upstream-merge-28868 
[MIRROR] Fixes lings losing organs on humanization
 2017-06-28 13:58:07 -05:00
CitadelStationBot
d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
CitadelStationBot
1e7c986ab5 Fixes emergency shuttle endgame state 2017-06-28 08:31:55 -05:00
CitadelStationBot
bdc234ea4b Fixes lings losing organs on humanization 2017-06-28 08:31:51 -05:00
CitadelStationBot
bae20af5ff makes virology window larger 2017-06-28 08:28:44 -05:00
CitadelStationBot
d2ff4f2374 Cogscarabs will now visually flip over when stunned (#1535) 2017-06-28 04:09:05 -05:00
CitadelStationBot
c7d4809579 Reduces default brig times to be consistent with suggested policy. (#1609) 2017-06-28 04:07:43 -05:00
CitadelStationBot
ec253c4e28 [MIRROR] cryotube pod improvements (#1681) 
* Bay-like cryotube pods

* Update cryo.dm

* Delete cryo.dm.rej

* Delete cryo.dm

* cryogenics.dmi
 2017-06-28 04:01:35 -05:00
CitadelStationBot
237691f6fd [MIRROR] Fixes problems that were in the original PR (#1419) 
* Fixes problems that were in the original PR

* rej cleanup

* Wow CSS is even worse than byond
 2017-06-28 03:02:50 -05:00
CitadelStationBot
32f904356d [MIRROR] Removes check_tick from ORM ui_data (#1415) 
* Removes check_tick from ORM ui_data

* Update machine_redemption.dm

* Delete machine_redemption.dm.rej
 2017-06-28 02:28:00 -05:00
CitadelStationBot
65736b7e23 [MIRROR] Ports the Ore Redemption Machine to TGUI (#1414) 
* Ports the Ore Redemption Machine to TGUI

* Update tgui.css

* Update tgui.js

* Delete tgui.css.rej

* Delete tgui.js.rej
 2017-06-28 02:24:55 -05:00
Poojawa
789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
CitadelStationBot
a7c18e65bc [MIRROR] fix .html files being invalid types (#1413) 
* fix .html files being invalid types

* Delete files.dm.rej
 2017-06-28 01:43:48 -05:00
LetterJay
196db74cbe Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588 
[MIRROR] Changes to the Atmos Watertank Backpack
 2017-06-27 22:59:32 -05:00
LetterJay
7f250e742a Merge pull request #1798 from Citadel-Station-13/upstream-merge-28856 
[MIRROR] Straight jackets can now properly be put onto others
 2017-06-27 22:53:40 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
CitadelStationBot
ed4aa5a01a Straight jackets can now properly be put onto others 2017-06-27 15:34:06 -05:00
LetterJay
00925de5f3 Update energy_gun.dm 2017-06-27 12:20:39 -05:00
LetterJay
3f3f86e81a Merge pull request #1794 from Citadel-Station-13/upstream-merge-28853 
[MIRROR] Adds container types INJECTABLE and DRAWABLE
 2017-06-27 09:33:15 -05:00
CitadelStationBot
6a38955803 Adds container types INJECTABLE and DRAWABLE 2017-06-27 08:19:49 -05:00
CitadelStationBot
360209314d Some fixes for the anomalous crystal 2017-06-27 08:13:38 -05:00
LetterJay
bb916b6040 Merge branch 'master' into upstream-merge-28681 2017-06-27 06:16:34 -05:00
LetterJay
83fead2492 Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567 
[MIRROR] Refactors PDA cartridge permissions
 2017-06-27 06:14:42 -05:00
LetterJay
f85de2ddd5 Update PDA_types.dm 2017-06-27 05:58:34 -05:00
LetterJay
2158ea1e67 Merge branch 'master' into upstream-merge-28681 2017-06-27 05:14:45 -05:00
LetterJay
8875fbefc5 Delete cart.dm.rej 2017-06-27 05:12:25 -05:00
LetterJay
9d6dec8975 Update cart.dm 2017-06-27 05:12:05 -05:00
LetterJay
163bcf0189 Delete PDA.dm.rej 2017-06-27 05:11:20 -05:00
LetterJay
926589fd58 Update PDA.dm 2017-06-27 05:11:06 -05:00
LetterJay
45b6931d9b Update computer.dm 2017-06-27 00:28:52 -05:00
LetterJay
95a77e9dc1 Merge pull request #1790 from Citadel-Station-13/upstream-merge-28831 
[MIRROR] Fix modular consoles
 2017-06-27 00:27:47 -05:00
LetterJay
fdf216bf48 Merge pull request #1728 from Citadel-Station-13/upstream-merge-28645 
[MIRROR] Adds custom lighting support to modular computers, and a flashlight to tablets
 2017-06-26 23:37:01 -05:00
LetterJay
ccf4306224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-06-26 23:19:54 -05:00