Commit Graph

2359 Commits

Author SHA1 Message Date
LetterJay
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
LetterJay
51b44c1726 Merge pull request #2921 from Citadel-Station-13/upstream-merge-30593
[MIRROR] Rare Spider Variants!
2017-09-24 09:34:52 -04:00
ktccd
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
Armhulen
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
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
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
Robustin
894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -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
Jordie
1030130672 Fixes create outfit Href issues 2017-09-23 05:32:36 -05:00
Poojawa
7b5734d684 faction memes don't work, restrict access instead. 2017-09-23 02:11:55 -05:00
Poojawa
ba9b5a0481 probably stops Ashligger station attacks 2017-09-23 00:58:32 -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
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
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
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
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
e154c27a72 Update circulator.dm 2017-09-21 06:35:01 -05:00
LetterJay
c1a3dc1c1e Update cameranet.dm 2017-09-21 06:33:36 -05:00
LetterJay
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
LetterJay
e05b24483c Merge pull request #2879 from Citadel-Station-13/upstream-merge-30871
[MIRROR] Fix: No more beating sounds from dead hearts
2017-09-21 07:32:04 -04:00
LetterJay
ee7f3f748f Merge pull request #2877 from Citadel-Station-13/upstream-merge-30841
[MIRROR] Buffs Magillitis
2017-09-21 07:31:44 -04:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
Poojawa
aec48daa0a Ashdrake noms (#2868)
* Initial commit

* probably a better way to check this

* It compiled boys. Let's see if it works.

* IT WAS ALL NULLS, BOYS

* Hooray, it's not broken anymore boys!

* Well it works, but we need transfer IDs to work

locating them post-initialize would help, probably. Then assigning their
links soon after.

* Bellies linked, autotransfer, LoseTarget

* half-thought sanity check needs to go away

* A few last minute tweaks.
2017-09-21 06:29:08 -05:00