Commit Graph

15989 Commits

Author SHA1 Message Date
Cheridan 633dc259dc Merge pull request #8751 from MrPerson/kudzu_more_like_crapzu_amirite
Give kudzu mouse_opacity 2 so clicking them is easier
2015-04-08 09:04:17 -05:00
Cheridan c5f6f5ff2c Merge pull request #8812 from Jalleo/Removal
Removal of empty file
2015-04-08 08:44:43 -05:00
Cheridan f537b43108 Merge pull request #8789 from phil235/BeartrapFix
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
Jordie0608 ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608 ffbef1f7d9 inversed check fix 2015-04-08 16:22:51 +10:00
Jordie0608 60cf76c881 fixes 2015-04-08 16:11:56 +10:00
Jordie0608 37277f66e7 pre-map compile 2015-04-08 15:40:41 +10:00
Incoming 654a332d21 Removes the Mutant_colors config option because anyone who's apt to turn on mutant races for joining doesn't want them to all look EXACTLY THE SAME (That's racist guys) 2015-04-08 01:24:55 -04:00
Sawu 6103b2a5e1 Fixes Spraycans not coloring faces correctly
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
phil235 7df5998740 Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma. 2015-04-08 03:44:56 +02:00
norill bb93aaf8c1 Move_Pulled around corners
- can now move dense objects around corners in a non-gimmicky way
2015-04-08 02:47:56 +02:00
Cheridan 4554d54229 Merge pull request #8765 from phil235/UdderFix
Fixes goat not producing milk and not retaliating.
2015-04-07 19:29:12 -05:00
Iamgoofball c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
Xhuis 2cb387af90 Adds proximity/stat/etc. check and removes bloat 2015-04-07 19:52:14 -04:00
Iamgoofball 54154bec12 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-04-07 16:21:07 -07:00
norill 73e4502a64 outer +/- hrefs in tank pressure gui change pressure by 5kPa instead of 10 now 2015-04-08 00:00:39 +02:00
Fayrik 98b5f41770 As you can see, I'm an idiot that codes potential infinite loops. (But I also fix it too.) 2015-04-07 21:48:00 +01:00
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
blah af99eea983 okay 2015-04-07 18:57:30 +01:00
norill 5e8b90e02b fixed biased shuffle algorithm 2015-04-07 19:12:51 +02:00
phil235 063b1c202d derp 2015-04-07 17:47:57 +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
Zelacks cb6bae5e52 -Defibs no longer have a minimum damage requirement. Previously the body required to be damaged in order to be defibbed (Required to be damaged, atleast 200 units). I can only assume that this was the case because the author had math that needed the body to have atleast 200 units of damage for it to work correctly, but I assume that the author naively thought it was impossible to heal corpses.
--Defibs now restore the health of the user to halfway between crit and death (-50 health or 150 sustained damage). If the user has little damage sustained, they will receive oxyloss to place them to the halfway point. If the corpse has more damage than the halfway point, they will be healed to the halfway point, in a ratio based on how much they sustained in each type of damage they took.
--Defibs will not heal cloneloss, and will still damage/heal the patient to the halfway point including the cloneless (eg a patient who is 0/0/0/0 with 30 cloneless receives 120 oxyloss). If the patient has too much cloneloss, they will heal fully, except they will still have the cloneloss (eg, they will be 0/0/0/0 with 180 cloneloss on revival)
--Additonal feedback given for some failure states for the defib.
2015-04-07 18:28:32 +08:00
xxalpha 09067eac4f Removed Reviver implant. Commented out some implant designs. 2015-04-07 07:52:07 +01:00
hornygranny e957233907 Merge pull request #8772 from MrPerson/foam_fixarooney
Fixes cleaner grenades
2015-04-06 16:09:35 -07: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 062d0c2086 Merge pull request #8759 from optimumtact/patch-3
Fix can_speak check in megaphone
2015-04-06 08:48:49 -05:00
kingofkosmos 97cbc65d6d usr -> C 2015-04-06 10:38:51 +03:00
ACCount12 3efb1124ee fix for a fix 2015-04-06 15:55:47 +12: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
CosmicScientist 8d6bca61d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem 2015-04-06 03:33:35 +01:00
Xhuis 2e312cb510 Adds unstable mutation toxin 2015-04-05 22:02:41 -04:00
Incoming d3c3cb42eb "The Mulligan system, as it exists today, is practically bug free"
-Incoming 4/5/15
2015-04-05 21:08:48 -04:00
CosmicScientist 13060bb6f4 Adds space carp traitor item and fun for carp plushie. 2015-04-06 02:04:16 +01:00
Incoming5643 d0144030e0 Good use of commits there Incoming 2015-04-05 20:45:53 -04:00
Incoming 1ee2cbb9ac Fine whatever I don't care
-Tommy Wiseau
2015-04-05 20:41:26 -04:00
Incoming 5591e93372 Fixes my fix to fix the infinite overmind death mambo fix 2015-04-05 20:28:48 -04:00
MrPerson 94c0c1598d Fixes cleaner grenades
Fixes #8757
Default for locate is "in world"!
2015-04-05 16:55:17 -07:00
Xhuis 27625530e3 Kenny Loggins 2015-04-05 19:13:23 -04:00
Remie Richards a965f17c3c Corrects return values, fixes cell draining. 2015-04-05 22:03:41 +01:00