shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,596 Commits 5 Branches 0 Tags
41276ce631d87d1c9e032aa5bafb1001983cea4e
Commit Graph

5596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Brown 41276ce631 Fixes missing Href tokens (#30987) 
* Fixes missing Href tokens

* Add missing form field. Fixes #30986
 2017-09-26 07:27:49 -05:00
kevinz000 2612f2b9cf Update beam_rifle.dm (#2943) 2017-09-26 07:54:30 -04:00
LetterJay 26f0af19e0 update 2017-09-26 00:00:07 -05:00
LetterJay e878e75c42 donator item 2017-09-25 23:49:06 -05:00
LetterJay 9a960678f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-25 19:56:45 -05:00
LetterJay 8ff51624e1 Merge pull request #2934 from Citadel-Station-13/upstream-merge-30913 
[MIRROR] Stops AIs from giving the borg a free secondary light
 2017-09-25 13:29:02 -04:00
LetterJay 8fd6d9d883 Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980 
[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
 2017-09-25 13:28:05 -04:00
LetterJay 196caaf3e1 Merge pull request #2931 from Citadel-Station-13/upstream-merge-30984 
[MIRROR] Makes keywords_lookup use the global token
 2017-09-25 13:27:46 -04:00
LetterJay 45751464e0 Merge pull request #2930 from Citadel-Station-13/upstream-merge-30975 
[MIRROR] Href tokens
 2017-09-25 13:27:27 -04:00
LetterJay e97256023b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-25 11:59:23 -05:00
LetterJay 954b056e97 Update security.dm 2017-09-25 11:56:55 -05:00
LetterJay e8544a1ac0 Merge pull request #2932 from Citadel-Station-13/upstream-merge-30959 
[MIRROR] Allow AIs to greentext survive
 2017-09-25 12:55:33 -04:00
LetterJay d8736482fd Update transfer_valve.dm 2017-09-25 11:55:09 -05:00
Poojawa 2071dfd1a5 Readds alert level sounds (#2920) 2017-09-24 21:21:33 -05:00
CitadelStationBot d93345cdd5 Stops AIs from giving the borg a free secondary light 2017-09-24 17:58:38 -05:00
KorPhaeron 31f6898a87 Stops AIs from giving the borg a free secondary light (#30913) 
* Stops AIs from giving the borg a free secondary light

* Using a camera var now

* Wrong if

* My brain is not working
 2017-09-24 17:58:37 -05:00
vuonojenmustaturska 11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
CitadelStationBot 21e473a433 Allow AIs to greentext survive 2017-09-24 17:38:01 -05:00
pubby 382d549c2f Allow AIs to greentext survive (#30959) 
* Change AI objectives from survive to exist

* Cyberboss simplification
 2017-09-24 17:38:00 -05:00
CitadelStationBot 3de425db96 Makes keywords_lookup use the global token 2017-09-24 17:35:49 -05:00
oranges a6ae23aefb Merge pull request #30984 from tgstation/Cyberboss-patch-4 
Makes keywords_lookup use the global token
 2017-09-24 17:35:49 -05:00
oranges 6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
CitadelStationBot 5b05af9036 Automatic changelog generation for PR #2923 [ci skip] 2017-09-24 14:49:21 -05:00
LetterJay e16d89d077 Merge pull request #2923 from jughu/hi-hello 
Allows custom renaming for holy weapons
 2017-09-24 15:49:19 -04:00
CitadelStationBot 38de7498e4 Automatic changelog generation for PR #2929 [ci skip] 2017-09-24 14:48:13 -05:00
LetterJay c20cb8138b Merge pull request #2929 from Citadel-Station-13/upstream-merge-30982 
[MIRROR] Implant Chairs now also support organs
 2017-09-24 15:48:11 -04:00
CitadelStationBot 1e403a0aba Automatic changelog generation for PR #2909 [ci skip] 2017-09-24 14:47:52 -05:00
LetterJay beedb36400 Merge pull request #2909 from Poojawa/flightsuit-adjustments 
Flight suit tweaks
 2017-09-24 15:47:50 -04:00
CitadelStationBot 16b57223d7 Implant Chairs now also support organs 2017-09-24 11:55:22 -05:00
MoreRobustThanYou df607bb24c Implant Chairs now also support organs (#30982) 
* Implant Chairs now also support organs

* Update implantchair.dm

* Update implantchair.dm
 2017-09-24 11:55:22 -05:00
CitadelStationBot 30ad17101b Automatic changelog generation for PR #2583 [ci skip] 2017-09-24 10:34:52 -05:00
LetterJay 076ba227e5 Merge pull request #2583 from deathride58/screenshake 
Extra Screenshake and Screenshake accessories.
 2017-09-24 11:34:50 -04:00
LetterJay 1c9061058f Merge pull request #2928 from Citadel-Station-13/upstream-merge-30899 
[MIRROR] Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period
 2017-09-24 11:34:01 -04:00
LetterJay 92c693ecc7 Merge pull request #2924 from Citadel-Station-13/upstream-merge-30961 
[MIRROR] You can now Indiana Jones one explosion.
 2017-09-24 11:33:39 -04:00
LetterJay 914e661618 Merge pull request #2908 from Citadel-Station-13/Ashwalker-nerfs 
Mining Shuttle requires mining access to use
 2017-09-24 11:33:21 -04:00
CitadelStationBot 7f01a9308e Automatic changelog generation for PR #2907 [ci skip] 2017-09-24 10:32:43 -05:00
LetterJay 8cb93a512c Merge pull request #2907 from Michiyamenotehifunana/wave2ofguns 
Wave 2 of guns
 2017-09-24 11:32:41 -04:00
LetterJay 46b91db045 updated toy item to use the squeak component as well as update the icon for a donator 2017-09-24 10:27:09 -05:00
LetterJay b6e0cf9476 cleanup 2017-09-24 10:22:40 -05:00
CitadelStationBot ef242fd700 Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period 2017-09-24 10:10:22 -05:00
Joan Lung 3505e14b45 Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period (#30899) 
* Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period

* tweak

* fix
 2017-09-24 10:10:22 -05:00
LetterJay f462c1ba93 Merge pull request #2925 from Citadel-Station-13/upstream-merge-30970 
[MIRROR] Enables meteors to qdel normally, saving actual seconds of time spent harddeleting them otherwise
 2017-09-24 09:36:50 -04:00
LetterJay ac8e74e517 Update freezer.dm 2017-09-24 08:35:36 -05:00
CitadelStationBot ff59548cb7 Automatic changelog generation for PR #2921 [ci skip] 2017-09-24 08:34:55 -05:00
LetterJay 51b44c1726 Merge pull request #2921 from Citadel-Station-13/upstream-merge-30593 
[MIRROR] Rare Spider Variants!
 2017-09-24 09:34:52 -04:00
ktccd c8aeec815a Adds sanitation to flavor_text (#2926) 
Exactly what it sounds like. Boy, my security skills are shit, for
someone who's supposed to be studying exactly this shit at uni, isn't
it?
 2017-09-24 03:15:02 -05:00
CitadelStationBot 12e9862bac Enables meteors to qdel normally, saving actual seconds of time spent harddeleting them otherwise 2017-09-23 23:35:14 -05:00
vuonojenmustaturska d111c582b4 Meteors can now qdel normally (#30970) 2017-09-23 23:35:14 -05:00
Iamgoofball 60bdb54024 You can now Indiana Jones one explosion. 2017-09-23 23:34:04 -05:00
jughu 617eb4c889 The new hip 2017-09-24 01:04:39 +02:00