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

3938 Commits

Author SHA1 Message Date
Jordan Brown
4670aeb42b Makes a flags var use NONE instead of 0 2017-09-24 01:59:51 -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
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
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
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
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
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
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
CitadelStationBot
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
Jordie
1030130672 Fixes create outfit Href issues 2017-09-23 05:32:36 -05:00
CitadelStationBot
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
CitadelStationBot
518e04a653 [MIRROR] Fixes game panel href token (#2898) 
* Fixes game panel href token

* wew
 2017-09-23 00:30:09 -05:00
CitadelStationBot
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
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
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
CitadelStationBot
2757fae7e2 [MIRROR] Fixes shaving headless mobs (#2890) 
* Fixes shaving headless mobs

* Update cosmetics.dm
 2017-09-22 22:31:54 -05:00
CitadelStationBot
2c78f7122c [MIRROR] Adds some new plushies (#2866) 
* Adds some new plushies

* Update packs.dm
 2017-09-22 22:31:07 -05:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
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
Poojawa
573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
LetterJay
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
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
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
CitadelStationBot
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
CitadelStationBot
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
LetterJay
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
Poojawa
b7739d1c77 Update hostile.dm 2017-09-21 15:40:04 -05:00
LetterJay
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
LetterJay
fcb907d2ce Merge pull request #2872 from Citadel-Station-13/upstream-merge-30802 
[MIRROR] Stamina regen light
 2017-09-21 07:36:45 -04:00
LetterJay
36cdee9f1c Merge pull request #2871 from Citadel-Station-13/upstream-merge-30848 
[MIRROR] VV Href Fixes
 2017-09-21 07:35:24 -04:00