shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,495 Commits 5 Branches 0 Tags
91fd8f7132d4b4d71b14a50ebf2aa668a8ebe5ea
Commit Graph
5495 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CitadelStationBotandPoojawa e0b3e861c0 [MIRROR] Removes spawn()s in securitrons (#2901) 
* Removes spawn()s in securitrons (#30945)

* Removes spawns in securitrons

* Update sound.dm

* Update secbot.dm

* Removes spawn()s in securitrons
 2017-09-22 22:37:07 -05:00
CitadelStationBotandPoojawa 11ebba05e4 [MIRROR] Travis improvements for tools and trusty environment bump (#2900) 
* Travis improvements for tools and trusty environment bump

We now run a php linter on the webhook

We now combine and build all maps in the right build script

Because only the byond build will use the maps this shouldn't
run in the tools script file, this is only working because of
the order the build scripts are run in the travis yml

*  Travis improvements for tools and trusty environment bump
 2017-09-22 22:36:41 -05:00
CitadelStationBotandPoojawa e9e80e3ce6 [MIRROR] Stops restraint removal progress bar spam (#2899) 
* Stops restraint removal progress bar spam

* Stops restraint removal progress bar spam
 2017-09-22 22:36:16 -05:00
CitadelStationBot f434049c37 Automatic changelog generation for PR #2897 [ci skip] 2017-09-22 22:32:24 -05:00
CitadelStationBotandPoojawa 7b7ddccbbc [MIRROR] Zombies cease healing for 6 seconds after taking damage (#2897) 
* Zombies cease healing for 6 seconds after taking damage (#30885)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Organic var for Organs

* Update liver.dm

* Zombie healing ceases in combat

* Update zombies.dm

* Update liver.dm

* Update organ_internal.dm

* TIMER_OVERRIDE

* 2 equal signs

* New condition structure

* UNIQUE and OVERRIDE

* Removes timer

* Zombies cease healing for 6 seconds after taking damage
 2017-09-22 22:32:22 -05:00
CitadelStationBotandPoojawa 2757fae7e2 [MIRROR] Fixes shaving headless mobs (#2890) 
* Fixes shaving headless mobs

* Update cosmetics.dm
 2017-09-22 22:31:54 -05:00
CitadelStationBotandPoojawa 117c8bf04d [MIRROR] Adds bioclosets to omega medbay, sci, and sec (#2889) 
* Merge pull request #30903 from ShizCalev/omega-bio-closets

Adds bioclosets to omega medbay, sci, and sec

* Adds bioclosets to omega medbay, sci, and sec
 2017-09-22 22:31:27 -05:00
CitadelStationBot 156e0f5658 Automatic changelog generation for PR #2866 [ci skip] 2017-09-22 22:31:08 -05:00
CitadelStationBotandPoojawa 2c78f7122c [MIRROR] Adds some new plushies (#2866) 
* Adds some new plushies

* Update packs.dm
 2017-09-22 22:31:07 -05:00
CitadelStationBotandPoojawa 6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
PoojawaandGitHub 235236c5a9 updates tool folder (#2905) 
* updates tool folder

* impliments #2874 changes
 2017-09-22 21:56:34 -05:00
CitadelStationBot 21088ca9ba Automatic changelog generation for PR #2573 [ci skip] 2017-09-22 20:23:57 -05:00
CitadelStationBotandPoojawa c85e409872 [MIRROR] Removes the multiverse and its sword (#2573) 
* Merge pull request #30283 from pubby/multiverse

Removes the multiverse and its sword

* Removes the multiverse and its sword
 2017-09-22 20:23:56 -05:00
CitadelStationBotandPoojawa 3e2f638793 [MIRROR] Cleans up internal temp code (#2853) 
* Cleans up internal temp code (#30715)

* cleanup

* Update living.dm

* Update atoms.dm

* Update objs.dm

* Cleans up internal temp code

* Update living.dm

* Update living.dm

* fixes then ommits mob_temp stuff.

* wew lad. commenting shit out is picky af.
 2017-09-22 20:20:56 -05:00
CitadelStationBotandPoojawa cc49f70de8 [MIRROR] Make scrubber code use temporary vars consistently (#2862) 
* Make scrubber code use temporary vars consistently

* fixes merge mess
 2017-09-22 20:11:50 -05:00
CitadelStationBotandPoojawa bf1e4a456f [MIRROR] Improve atmos components code + OmegaStation fixes (#2752) 
* Improve atmos components code + OmegaStation fixes

* Update circulator.dm

* Update dp_vent_pump.dm

* Update pump.dm

* Update volume_pump.dm

* Update pump.dm

* Update pump.dm

* Update volume_pump.dm

* fixes pumps shows area rather than vague jump

also removes it from admin log, wew

* wew
 2017-09-22 20:05:58 -05:00
CitadelStationBotandPoojawa 751e219f4b [MIRROR] Fixes the sprite of the prototype hardsuit. (#2849) 
* Fixes the sprite of the prototype hardsuit.

* update suit.dmi
 2017-09-22 19:44:14 -05:00
CitadelStationBotandPoojawa 8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
CitadelStationBotandPoojawa ec65e75b10 [MIRROR] Fix MetaStation xenobio area (#2850) 
* Fix MetaStation xenobio area (#30830)

* Fix MetaStation xenobio area
 2017-09-22 19:10:18 -05:00
CitadelStationBotandPoojawa 944753dccd [MIRROR] Makes action buttons call the correct procs (#2902) 
* Makes action buttons call the correct procs (#30921)

* Makes action buttons call the correct procs

* Changed to mob/living proc

* CB

* Makes action buttons call the correct procs
 2017-09-22 19:00:34 -05:00
CitadelStationBotandPoojawa 0925853992 [MIRROR] [S] fixes sentience potions working through cams (#2896) 
* Fixes sentience potions working through cams (#30914)

* [S] fixes sentience potions working through cams
 2017-09-22 19:00:07 -05:00
CitadelStationBotandPoojawa d0274da310 [MIRROR] Click signals (#2903) 
* Merge pull request #30924 from ninjanomnom/click-signals

Click signals

* Click signals
 2017-09-22 18:59:17 -05:00
CitadelStationBot 6b4da1f99c Automatic changelog generation for PR #2904 [ci skip] 2017-09-22 18:58:23 -05:00
CitadelStationBotandPoojawa 2599bca054 [MIRROR] Taking the beaker out of a cryotube now tries to put it into your hand (#2904) 
* Taking the beaker out of a cryotube now tries to put it into your hand (#30938)

* Taking the beaker out of a cryotube now tries to put it into your hand

* this is better

* THIS is better

* Fixes potential bugs

* Update cryo.dm

* Taking the beaker out of a cryotube now tries to put it into your hand
 2017-09-22 18:58:22 -05:00
LetterJayandGitHub 9db84b0c4f Merge pull request #2894 from Citadel-Station-13/Re-port-materials 
Reapplies material componets
 2017-09-22 12:12:28 -04:00
Poojawa 573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
LetterJayandGitHub 54bd982d6b Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681 
[MIRROR] Prevents the creation of Shadowzombiechangelings
 2017-09-22 08:43:37 -04:00
CitadelStationBot b1ff46f228 Automatic changelog generation for PR #2886 [ci skip] 2017-09-22 04:47:41 -05:00
CitadelStationBotandPoojawa 9e18d9055a [MIRROR] Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc. (#2886) 
* Merge pull request #30890 from vuonojenmustaturska/adminghostfix

Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc.

* Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc.
 2017-09-22 04:47:39 -05:00
CitadelStationBot 60ca9a16ea Automatic changelog generation for PR #2887 [ci skip] 2017-09-22 04:47:10 -05:00
CitadelStationBotandPoojawa e783c39419 [MIRROR] Mice spawn now chooses correct z-level (#2887) 
* Merge pull request #30897 from AutomaticFrenzy/squeakFix

Mice spawn now chooses correct z-level

* Mice spawn now chooses correct z-level

* Update squeak.dm
 2017-09-22 04:47:08 -05:00
CitadelStationBotandPoojawa 2ab0c3696e [MIRROR] Fixes it so patches do not work on robotic limbs. (#2893) 
* Merge pull request #30851 from Firecage/nopatchesonnonorganiclimbspleaseandthankyoumistergoof

Fixes it so patches do not work on robotic limbs.

* Fixes it so patches do not work on robotic limbs.
 2017-09-22 04:46:19 -05:00
CitadelStationBotandPoojawa fd64d4fdfa [MIRROR] Fixes IRC ahelp answer notifications (#2888) 
* Merge pull request #30912 from tgstation/Cyberboss-patch-4

Fixes IRC ahelp answer notifications

* Fixes IRC ahelp answer notifications
 2017-09-22 04:45:24 -05:00
LetterJayandGitHub 8c6c57ff32 Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896 
[MIRROR] Removes old debug text
 2017-09-22 00:03:30 -04:00
PoojawaandGitHub b7739d1c77 Update hostile.dm 2017-09-21 15:40:04 -05:00
LetterJayandGitHub dd7189618f Merge pull request #2873 from Citadel-Station-13/upstream-merge-30768 
[MIRROR] Adds back required arrivals undockedness with a config
 2017-09-21 07:37:04 -04:00
CitadelStationBot 55841673b5 Automatic changelog generation for PR #2872 [ci skip] 2017-09-21 06:36:46 -05:00
LetterJayandGitHub fcb907d2ce Merge pull request #2872 from Citadel-Station-13/upstream-merge-30802 
[MIRROR] Stamina regen light
 2017-09-21 07:36:45 -04:00
LetterJayandGitHub 36cdee9f1c Merge pull request #2871 from Citadel-Station-13/upstream-merge-30848 
[MIRROR] VV Href Fixes
 2017-09-21 07:35:24 -04:00
LetterJayandGitHub e154c27a72 Update circulator.dm 2017-09-21 06:35:01 -05:00
LetterJayandGitHub c1a3dc1c1e Update cameranet.dm 2017-09-21 06:33:36 -05:00
LetterJayandGitHub afa1ef069c Merge pull request #2884 from Citadel-Station-13/upstream-merge-30891 
[MIRROR] Fixes banning panel href errors, adds href helper functions
 2017-09-21 07:32:42 -04:00