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

3992 Commits

Author SHA1 Message Date
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05: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
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
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
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
LetterJay
e16d89d077 Merge pull request #2923 from jughu/hi-hello 
Allows custom renaming for holy weapons
 2017-09-24 15:49:19 -04: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
LetterJay
beedb36400 Merge pull request #2909 from Poojawa/flightsuit-adjustments 
Flight suit tweaks
 2017-09-24 15:47:50 -04: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
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
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
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
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
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
jughu
5b1b550c0e Update holy_weapons.dm 2017-09-24 00:34:24 +02:00
Armhulen
2f64e2099f Rare Spider Variants! (#30593) 
* vipers use venom, tarantulas are fat and slow.

* viper!

added!

* tarantula!

done!

* tarantulas are big guys

nobody pushin them round

* added maidwives, added spider channel

* me and cobby lose our minds over shitcode 2

electric boogaloo

* midwives have skins

shiny

* YES XHUIS GOT IT WORKING WHAT A GUY YEAAAAAAAAAAA

WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO

* new nurse sprite is in!

yay

* cosby joke about all my shit corrupting idk

this is gonna be annoying to fix

* Revert "cosby joke about all my shit corrupting idk"

This reverts commit 680b4c310e0b882f7465129c093e7f69fdff15c6.

* starts to add spidervenom, finishing tomorrow

* fuck god dammit shit fuck

* WE ARE BACK IN BIZNIZ TY ORANGES

* whoops

* feed me semour feed me all night long

fixes the cyberboss stuff except that complicated one i'll do something else with it for now

* temporary fix maybe

* lets just have this for now and i'll fix this later

* all good

* fixes

* does what i should have done a long time ago

* SKINS SKINS SKINS PULLAPALOOZA

* i think this does it okay

* spiders miright

* merge conflict fix?

* MISTAKES WERE MADE

* spider commands are cool now

* he protec

but he also attac

* ty joan

* ty joan again
 2017-09-23 16:18:43 -05:00
LetterJay
95e614f4b7 Merge pull request #2917 from Citadel-Station-13/upstream-merge-30956 
[MIRROR] Fixes revolutionary deconversion messages and logging
 2017-09-23 16:45:53 -04:00
LetterJay
0b820ce655 Merge pull request #2919 from Citadel-Station-13/upstream-merge-30906 
[MIRROR] Fixes create antag wizard spawn
 2017-09-23 14:53:11 -04:00
LetterJay
cddcd82840 Update login.dm 2017-09-23 13:52:29 -05:00
LetterJay
44f779cc1f Merge pull request #2912 from Citadel-Station-13/upstream-merge-30931 
[MIRROR] Fixes create outfit Href issues
 2017-09-23 14:51:31 -04:00
deathride58
4e793a5630 Should work 2017-09-23 13:17:21 -04:00
AnturK
ea6e1356ba Fixes create antag wizard 2017-09-23 11:12:29 -05:00
Robustin
894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
deathride58
20700dab57 change for the sake of change - laying the groundwork to let players directly change the percentage of screenshake 2017-09-23 11:18:48 -04:00
LetterJay
f8eef1755f oops 2017-09-23 10:09:59 -05:00
deathride58
1ff6058b6a Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into screenshake 2017-09-23 11:07:32 -04:00
LetterJay
d25746fd66 donations items 2017-09-23 10:07:15 -05:00
Poojawa
f004c09346 seriously, 1,261 lines changed over 2? 2017-09-23 06:18:54 -05:00