Commit Graph

5499 Commits

Author SHA1 Message Date
bgobandit dbd01d8a43 fixed 2016-03-07 12:28:35 -05:00
bgobandit ed67d189a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into catfixes
Conflicts:
	icons/mob/pets.dmi
2016-03-07 07:13:30 -05:00
bgobandit 128cf1e19d test 2016-03-07 07:07:34 -05:00
Cheridan f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted
Replaced last occurences of gc_destroyed by qdeleted()
2016-03-06 12:29:30 -06:00
Cheridan 5658a4d14b Merge pull request #15904 from KorPhaeron/lmao2cat
Nerfs catsplosion
2016-03-04 20:55:01 -06:00
tkdrg 2389fd0b01 Merge pull request #15899 from phil235/ResistandGrabFixes
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
KiwiFarms 9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
tkdrg 829926d71d Merge pull request #15891 from Ultimate-Chimera/XenoStuff
Fixes xenomorph hiss emote sounds because I am stupid.
2016-03-04 21:34:10 -03:00
tkdrg fd74fafb63 Merge pull request #15847 from Core0verload/cyborg_tools
New, faster tools for engineering cyborgs
2016-03-04 20:56:48 -03:00
tkdrg e1c2f70ca3 Merge pull request #15812 from Shadowlight213/secborgremoval
Adds a config option to disable the security cyborg module.
2016-03-04 20:54:57 -03:00
Shadowlight213 ebcbbec8e2 Reverses the config var so it forbids instead of allows 2016-03-04 10:49:00 -08:00
Joan Lung 6a79d12862 Merge pull request #15884 from RemieRichards/XenoBreathNoises
Aliens now make breathing noises
2016-03-04 12:22:45 -05:00
AnturK ae9e56d21f Merge pull request #15852 from KazeEspada/Cabin
Cabin Away Mission
2016-03-03 22:18:12 +01:00
KazeEspada 6d2a95eb43 Moves the mapGenerator to mapGeneratorObj.dm.
Cabin was given new carpets, and some fixes.

The snowy map generator now spawns bunnies.

New type of bunny that is not easter related.

Chickens now have support for no eggs.
2016-03-03 13:47:11 -07:00
phil235 a330cafea5 Fixes some mistakes.
Updating the package wrap's descriptions to be accurate and useful.
2016-03-03 21:02:03 +01:00
Shadowlight213 51c414e808 Removes the backup check. 2016-03-03 10:48:13 -08:00
Shadowlight213 510f9863dc fixes merge conflicts 2016-03-03 10:42:54 -08:00
KorPhaeron daa2a3316f 2cat!! 2016-03-03 12:27:00 -06:00
phil235 c7b7230827 Change some for loop with grabbed_by to be typeless since grabbed_by only contains grabs.
Replace super weird "locate(/obj/item/weapon/grab, locate(/obj/item/weapon/grab, mob.grabbed_by.len))" by simple if(grabbed_by.len)"
Cleans up Process_Grab to be easier to read.
Simplifies MobBump() proc, especially the part about pushing a mob that is pulling or is pullsed/grabbed. We no longer check for mobs in a 1 tile radius every time we bump a mob.
Fixes runtime with clear_reagents_to_vomit_pool() due to a typo.
2016-03-03 14:20:42 +01:00
Cheridan 2a6d069b5b Merge pull request #15867 from RemieRichards/monkey_jetpack_fix
Fixes Monkeys not being able to steer jetpacks.
2016-03-03 00:13:00 -06:00
Cheridan f7bd1fed74 Merge pull request #15869 from Core0verload/itsmagic
Allows aliens/monkeys to use magic/arm-mounted guns
2016-03-02 20:14:34 -06:00
Ultimate Chimera b65d66de7d Fixes Xenomorph hiss emote. 2016-03-02 19:01:34 -07:00
Remie Richards d32c0ea137 Aliens now make breathing noises 2016-03-02 18:07:21 +00:00
Remie Richards 1cb1e7bfa8 Merge pull request #15766 from GunHog/WJohnston's_How_To_Nerf_Your_Xeno
Xenos now suffer when the queen dies.
2016-03-02 17:34:45 +00:00
GunHog bf1738e631 Moves a check
Moves the owner check to after the recent_queen_death var reset.
Otherwise it probably would not be useable if implanted.
2016-03-02 11:21:56 -06:00
Cheridan ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo
Remake of #15690. Replaces newcult with oldcult.
2016-03-01 22:37:58 -06:00
GunHog a49d5dc924 Queen Dying is now based in the node
- Queen's death is now called on the node itself
- Slightly different effects for humans than aliens
2016-03-01 22:23:50 -06:00
Tkdrg a9ffb42aed Fixed the code not compiling 2016-03-01 23:19:01 -03:00
tkdrg 525fcb25e2 Merge pull request #15838 from Incoming5643/feline_magnet_2
Rolls back the life mechanic from Runtime
2016-03-01 22:01:24 -03:00
tkdrg 851902f52b Merge pull request #15743 from Shadowlight213/Voidpuppy
Adds Void puppies
2016-03-01 21:46:42 -03:00
tkdrg a0397a73a7 Merge pull request #15698 from LanCartwright/flyvomit
Flypeople now eat vomit
2016-03-01 21:30:15 -03:00
tkdrg 799e923eff Merge pull request #15840 from phil235/RobotAttackSelfFix
Cyborgs can no longer activate the object in their active module when incapacitated
2016-03-01 21:14:55 -03:00
tkdrg 9211b19b38 Merge pull request #15836 from phil235/SpellFix
Fixes spell action button not being updated correctly
2016-03-01 21:09:20 -03:00
tkdrg 09b06ad372 Merge pull request #15823 from tgstation/duncathan-corgis
Updates proc swap stack trace
2016-03-01 20:59:24 -03:00
c0 1dea7ac78b Defines 2016-03-02 00:23:50 +03:00
c0 af5276467b Allows aliens/monkeys to use magic and arm-mounted guns 2016-03-01 23:52:58 +03:00
Remie Richards 28a49d127d Fixes Monkeys not being able to steer jetpacks. 2016-03-01 18:00:00 +00:00
bgobandit 7788ef5f07 changes procs 2016-03-01 09:13:44 -05:00
tkdrg c02ccab8c0 Merge pull request #15758 from AnturK/spawners
Refactor of map and corpse spawners.
2016-02-29 23:44:38 -03:00
Akke 9c0bacbd72 Yea, though I walk through the valley of the shadow of death, I will fear no evil: for thou art with me oranges; thy remie and thy coderbus they comfort me. 2016-03-01 01:06:59 +00:00
phil235 4d2c6b8e24 Cyborgs can no longer activate the object in their active module when incapacitated. They also can't change their sensor mode (sechud, etc...) while incapacitated.
Fixes Wizard apprentice not being able to use soulstones.
2016-02-29 23:09:13 +01:00
Cheridan 946b89b5f2 Merge pull request #15791 from phil235/ReagentStatUpdateFix
Health update from reagent metabolization now only happens once.
2016-02-29 15:07:23 -06:00
Incoming 3758bf1f61 rolls back the life mechanic from Runtime 2016-02-29 15:54:04 -05:00
phil235 3c8a9274bf Fixes spell action button not being updated correctly regarding zlevel and clothes requirements. The buttons are now always not red in these cases but clicking them give the proper fail message.
Fixes blind AI (lack of power) staying blind if transfered to a mech or a card.
Fixes magboots action button icon not updating when toggling the boots on.
Fixes Area teleport spells not having a cancel button when choosing the destination area.
Fixes spell action button not being removed when the spell is refunded.
Fixes revenant spell action button icons not being updated when the revenant is inhibited by a null rod.
2016-02-29 16:30:54 +01:00
Jordie 32bf31f3a0 Merge pull request #15707 from Core0verload/breathing_implant
[Ready] New cyberimplant: breathing tube
2016-02-29 14:53:42 +11:00
tkdrg 6949167e6f Merge pull request #15792 from phil235/FullHealMutationFix
Admin healing a monkey no longer transforms it into a human. Only hum…
2016-02-28 21:12:18 -03:00
tkdrg c049d74cde Merge pull request #15804 from bgobandit/onlyslightlylessgross
Roach guts have the same layer as vomit, blood, etc
2016-02-28 21:10:41 -03:00
duncathan salt cdea45be4b quotes 2016-02-28 17:16:59 -06:00
duncathan salt 9809414da1 add it to simple animals 2016-02-28 17:11:47 -06:00
duncathan salt 4c3e8e8300 remove cleanbot message 2016-02-28 17:09:55 -06:00