Commit Graph

12467 Commits

Author SHA1 Message Date
phil235 028b40ecd1 I hate fixing merge conflicts. 2015-04-07 20:51:47 +02:00
phil235 6b83575b28 Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
Conflicts:
	code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
phil235 34a2b3be5b Flying animals no longer triggers mines and mousetraps.
Space carps are flying animals now.
Adding changelog
2015-04-07 20:20:29 +02:00
phil235 e11a405165 Fixes the holopad choice window spam. The holopad now uses the standard popup window used by computers and most machines. A simple click to close it.
Fixes /obj/item/clothing/suit/space/pirat hiding the mob's jumpsuit when worn.
2015-04-07 17:44:43 +02:00
xxalpha 09067eac4f Removed Reviver implant. Commented out some implant designs. 2015-04-07 07:52:07 +01:00
phil235 d60df6ea2e Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
Conflicts:
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/living_defines.dm
2015-04-07 01:06:38 +02:00
Incoming 1e2187083f Adds three new blob chems:
Omnizine blobs inject omnizine on hit, which initially HELPS mobs fighting it, but if they aren't careful in how often the blob hits them, they can rapidly fall into a very painful and hard to treat overdose. Three hits will inflict a heavy damage over time effect, more than that will inevitably cause death without treatment. They're a pleasent light lavender color.

Morphine blobs inject morphine on hit, which will keep mobs from slowing down but eventually will make them fall asleep. One hit will force a very small sleep after a while of fighting, multiple hits will forces longer sleeping after the same delay and overdose mechanics that make people drop held items and do minor tox damage. They're gunmetal grey.

Space Drugs will inject space drugs on hit, which makes mobs stumble around and make backing off from the blob more difficult. It also does minor on hit toxin damage. It's a weedy green.

Adding more blob chems makes any one chem type rarer, so I feel like this is one of the more fun ways the strength of some blob chems can be mitigated.
2015-04-06 18:18:16 -04:00
phil235 d0e9a5c0c9 Nerfs the kinetic accelerator.
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
phil235 1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +02:00
phil235 ad797d405e Better parsnip sprite 2015-04-06 19:25:27 +02:00
phil235 dd1dac556b Fixes a mob's pull not being broken when that mob is thrown. 2015-04-06 19:11:38 +02:00
Xhuis 9023f0de13 Blacklists shadowpeople from the race change 2015-04-06 13:02:11 -04:00
phil235 8499413649 Makes living/verb/resist more object oriented.
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
WJohn 9c4e744fc9 Merge pull request #8744 from xxalpha/cyberplus
Better sprites for chest cyber implants.
2015-04-06 12:43:10 -04:00
Cheridan 1da595b535 Merge pull request #8737 from RemieRichards/NinjaCleanup2
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
Xhuis 2e312cb510 Adds unstable mutation toxin 2015-04-05 22:02:41 -04:00
CosmicScientist 13060bb6f4 Adds space carp traitor item and fun for carp plushie. 2015-04-06 02:04:16 +01:00
Remie Richards a965f17c3c Corrects return values, fixes cell draining. 2015-04-05 22:03:41 +01:00
Remie Richards 5884c3727f Fixes nonnumerical defines, Special interaction should work nicer now. 2015-04-05 21:52:42 +01:00
kingofkosmos 8e63fe05c1 Breath mask autotoggle
Now if you have a breath mask on your face, but lowered, and decide to start running on internals, you will automatically adjust the mask back on your face!
2015-04-05 22:03:24 +03:00
phil235 e04c9ac072 Fixes goat not producing milk and not retaliating.
Fixes bear not being able to attack you when it's AI is asleep and awaken by finding you as target.
Fixes many hostile animals not having their own attack verb text or attack sound.
Fixes goat moving even when pulled.
GiveTarget() is now called by FindTarget (because it was always called after every instances of FindTarget, and this solves the lack of retaliation).
2015-04-05 20:30:39 +02:00
phil235 cbbd5897ee Fixes typos, rice pudding recipe changed, maxvolume and bitesize for superbiteburger and stew changed, cookbook updated. 2015-04-05 16:48:50 +02:00
MrPerson df4acb5043 Give kudzu mouse_opacity 2 so clicking them is easier
Clicking anywhere on a turf not occupied by something else == clicking the kudzu. Makes them much easier to click basically.
2015-04-04 21:28:29 -07:00
Remie Richards cb86467e47 Consistency with X_act() names, Ninjas can now electrocute carbon mobs by "draining" them, as they would a cell/smes/mecha etc. 2015-04-05 02:30:43 +01:00
Remie Richards 9c6c68b81a Removes SpiderOS, SpiderOS Information moved to a SpiderOS Statpanel, Fixes ninja_sword_recall() by preventing a katana from ever hitting its owner (it can still hit other ninjas) 2015-04-05 01:55:27 +01:00
Remie Richards bebe775021 Splits ninja glove drain() proc up into /atom/proc/ninjaDrainAct() 2015-04-05 00:09:28 +01:00
ACCount12 ccbb042606 Fixes for DNA spread and transformation 2015-04-05 09:17:51 +12:00
xxalpha 8a3e2f75a3 Better sprites for chest cyber implants. 2015-04-04 20:06:10 +01:00
phil235 6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes
Recieve --> Receive
2015-04-04 20:00:21 +02:00
phil235 e32a0b5b3e map fixes and adjusting max reagent volume for some foods. 2015-04-04 19:44:46 +02:00
phil235 f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
Remie Richards 5e93f57873 Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so. 2015-04-04 18:17:37 +01:00
MrPerson 719b3e6da9 April Fool's lasts only 2 days plus another holiday
New holiday for SS13's birthday. Or at least when it was listed on the BYOND hub, close enough.
2015-04-04 03:33:11 -07:00
MrPerson e2d8b62620 Reduces penalty to movespeed from being cold
It kicks in at a lower body temp and the slowdown is less harsh. You move noticeably faster than space wind, which was the goal here.
2015-04-04 03:08:24 -07:00
Jordie 6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings
Someone called for pest control?
2015-04-04 20:58:07 +11:00
Jordie 3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus
Cyber Implants +
2015-04-04 20:57:48 +11:00
Jordie 13a6a51550 Merge pull request #8689 from GunHog/InOtherNewsMoreRDsHaveBeenSpacedLately
Removes slowdown from Reactive Teleport Armor and increases activation chance
2015-04-04 20:57:33 +11:00
Jordie 19af7bd19e Merge pull request #8570 from RemieRichards/FireSpread
Fire spread on mob touch
2015-04-04 20:56:58 +11:00
Jordie 7dbd8b1d02 Merge pull request #8706 from phil235/WeakenedFix
Fixes weakened/stunned/paralysis not going down naturally for aliens.
2015-04-04 20:56:32 +11:00
phil235 22ff13eff8 Adding a whole bunch of food. 2015-04-04 02:35:48 +02:00
xxalpha 7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
phil235 493c3e038a Splitting food.dmi into smaller files.
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
Cheridan 0bd95eaa54 Revert "AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL" 2015-04-02 21:13:50 -05:00
phil235 c5a7b174ed Fixes many mobs who should be non dense and with PASSMOB flag.
Removes the update_slimes var from mob/living
2015-04-03 00:33:23 +02:00
phil235 b2ed381d86 No more dense butterflies pushing mobs. 2015-04-02 23:49:04 +02:00
phil235 e834781427 Fixes weakened/stunned/paralysis not going down naturally for aliens. 2015-04-02 23:25:08 +02:00
phil235 09df1080e9 Some adjustments:
Fixes with projectile bump() on border objects.
Fixes some projectile on_hit() not calling the parent on_hit.
Move projectile mob hit check code to mob/CanPass().
Simplifies projectile/CanPass()
Fixes runtime in projectile/Bump()
2015-04-02 17:39:02 +02:00
Jordie 4c1c55906f Merge pull request #8666 from phil235/AnimalsUpdatehealthFix
Fixes simple_animals being immune to fire damage melee attacks.
2015-04-02 20:16:18 +11:00
Jordie 57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00