shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,574 Commits 5 Branches 0 Tags
382d549c2ffb240238b14d79ad6121b9878dbaa5
Commit Graph
5574 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
pubbyandCitadelStationBot 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 5b05af9036 Automatic changelog generation for PR #2923 [ci skip] 2017-09-24 14:49:21 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
MoreRobustThanYouandCitadelStationBot 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
LetterJayandGitHub 076ba227e5 Merge pull request #2583 from deathride58/screenshake 
Extra Screenshake and Screenshake accessories.
 2017-09-24 11:34:50 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 8cb93a512c Merge pull request #2907 from Michiyamenotehifunana/wave2ofguns 
Wave 2 of guns
 2017-09-24 11:32:41 -04: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 LungandCitadelStationBot 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 51b44c1726 Merge pull request #2921 from Citadel-Station-13/upstream-merge-30593 
[MIRROR] Rare Spider Variants!
 2017-09-24 09:34:52 -04:00
ktccdandPoojawa 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
vuonojenmustaturskaandCitadelStationBot d111c582b4 Meteors can now qdel normally (#30970) 2017-09-23 23:35:14 -05:00
IamgoofballandCitadelStationBot 60bdb54024 You can now Indiana Jones one explosion. 2017-09-23 23:34:04 -05:00
jughuandGitHub 617eb4c889 The new hip 2017-09-24 01:04:39 +02:00
jughuandGitHub 5b1b550c0e Update holy_weapons.dm 2017-09-24 00:34:24 +02:00
CitadelStationBot 18f1e16b18 Rare Spider Variants! 2017-09-23 16:18:44 -05:00
ArmhulenandCitadelStationBot 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
CitadelStationBot 6966ebc14f Automatic changelog generation for PR #2917 [ci skip] 2017-09-23 15:45:55 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub cddcd82840 Update login.dm 2017-09-23 13:52:29 -05:00
LetterJayandGitHub 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
CitadelStationBot 14e042922e Fixes create antag wizard spawn 2017-09-23 11:12:29 -05:00
AnturKandCitadelStationBot ea6e1356ba Fixes create antag wizard 2017-09-23 11:12:29 -05:00
RobustinandCitadelStationBot 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
CitadelStationBot 5a03829049 Automatic changelog generation for PR #2915 [ci skip] 2017-09-23 06:16:57 -05:00
CitadelStationBotandPoojawa c1ea0af35e [MIRROR] Support Holoparasites can no longer heal while not manifested (#2915) 
* Merge pull request #30948 from MoreRobustThanYou/patch-13

Support Holoparasites can no longer heal while not manifested

* Support Holoparasites can no longer heal while not manifested
 2017-09-23 06:16:55 -05:00
CitadelStationBot 69bcfc73bb Automatic changelog generation for PR #2914 [ci skip] 2017-09-23 05:54:38 -05:00
CitadelStationBotandPoojawa 139130d70d [MIRROR] Zombies now stay dead if they suicide (#2914) 
* Zombies now stay dead if they suicide (#30941)

* Zombies now stay dead if they suicide

* Update items.dm

* Update items.dm

* Zombies now stay dead if they suicide
 2017-09-23 05:54:36 -05:00
CitadelStationBot f26bada520 Automatic changelog generation for PR #2913 [ci skip] 2017-09-23 05:54:17 -05:00