Commit Graph
5520 Commits
Author SHA1 Message Date
LetterJayandGitHub 2e133c0b2c Update ears.dm 2017-09-27 15:12:22 -05:00
Jordan BrownandCitadelStationBot 4670aeb42b Makes a flags var use NONE instead of 0 2017-09-24 01:59:51 -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
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
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