shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,537 Commits 5 Branches 0 Tags
914e661618fb9baa29261108696ab00061787bf6
Commit Graph
5537 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
LetterJay f8eef1755f oops 2017-09-23 10:09:59 -05: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
CitadelStationBotandPoojawa 9016cc6a17 [MIRROR] pAIs now transfer their languages to bots (#2913) 
* Merge pull request #30943 from MoreRobustThanYou/patch-11

pAIs now transfer their languages to bots

* pAIs now transfer their languages to bots
 2017-09-23 05:54:16 -05:00
CitadelStationBot e0f99269dd Automatic changelog generation for PR #2911 [ci skip] 2017-09-23 05:53:58 -05:00
CitadelStationBotandPoojawa 222274d108 [MIRROR] Using a soulstone on somebody now transfers your languages to the shade (#2911) 
* Merge pull request #30939 from MoreRobustThanYou/patch-8

Using a soulstone on somebody now transfers your languages to the shade

* Using a soulstone on somebody now transfers your languages to the shade
 2017-09-23 05:53:56 -05:00
CitadelStationBotandPoojawa 442689219e [MIRROR] SendSignal() speedup (#2910) 
* SendSignal() speedup (#30929)

* Rename component.dm to _component.dm

* Merges RecieveSignal() into SendSignal()

* Makes ComponentActivated() and AfterComponentActivated() async

* SendSignal() speedup
 2017-09-23 05:53:23 -05:00
JordieandCitadelStationBot 1030130672 Fixes create outfit Href issues 2017-09-23 05:32:36 -05:00
PoojawaandGitHub 08d4b2084e Update ghost_role_spawners.dm 2017-09-23 02:32:44 -05:00
PoojawaandGitHub 391c82e68d Update ghost_role_spawners.dm 2017-09-23 02:23:32 -05:00
Poojawa 28e9bc7d8c added a IC clause to make enforcement easier. 2017-09-23 02:18:02 -05:00
Poojawa 7b5734d684 faction memes don't work, restrict access instead. 2017-09-23 02:11:55 -05:00
Michiyamenotehifunana 05bbc43782 Wave 2 of guns 
Spinfusor, X9, Magpistol.
 2017-09-23 15:05:11 +08:00
Poojawa ba9b5a0481 probably stops Ashligger station attacks 2017-09-23 00:58:32 -05:00
Poojawa 0b9cec9f21 Merge remote-tracking branch 'refs/remotes/origin/master' into Ashwalker-nerfs 2017-09-23 00:51:39 -05:00
CitadelStationBotandPoojawa 51d8182b13 [MIRROR] Fixes species being referenced instead of copied when cloning (#2859) 
* Fixes species being referenced instead of copied when cloning

* fixes

* wew
 2017-09-23 00:34:09 -05:00
CitadelStationBotandPoojawa 518e04a653 [MIRROR] Fixes game panel href token (#2898) 
* Fixes game panel href token

* wew
 2017-09-23 00:30:09 -05:00
CitadelStationBot 91fd8f7132 Automatic changelog generation for PR #2878 [ci skip] 2017-09-23 00:13:06 -05:00
CitadelStationBotandPoojawa 0587962b53 [MIRROR] Makes gorillas drop brains when gibbed / butchered (#2878) 
* Makes gorillas drop brains when gibbed / butchered

* wew

* how the fuck did this even go missing

* this fucking game man.
 2017-09-23 00:13:04 -05:00
CitadelStationBot f8873ac455 Automatic changelog generation for PR #2875 [ci skip] 2017-09-22 23:35:56 -05:00
CitadelStationBotandPoojawa a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
CitadelStationBotandPoojawa eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895) 
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
 2017-09-22 23:35:36 -05:00
CitadelStationBotandPoojawa 2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857) 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
 2017-09-22 23:35:22 -05:00
Poojawa 6717720356 copypasta fails again 2017-09-22 23:34:41 -05:00
CitadelStationBotandPoojawa 3aafe338af [MIRROR] Fixes adjust config (#2723) 
* Fixes adjust config

* Update configuration.dm

* Update game_options.txt

* fixes persistance
 2017-09-22 23:02:09 -05:00