Commit Graph

4655 Commits

Author SHA1 Message Date
Fox-McCloud
c81be9cc5a Merge pull request #806 from tigercat2000/bugsss
Fixes an oversight with NO_BREATHE and corpses
2015-04-15 01:12:31 -04:00
Malkevin
9deb16dcdb Improved eyecheck()
Changes flash/welder protection eyecheck() proc from several hard coded
item checks to a /var check for eye covering items, reducing the number
of IF statements and allowing greater flexibility as child items can
have a different protection level to their parent.

Created a new proc tintcheck()
-Items have a separate tint var to allow for items to protect
but not impair, such as space helmets.

-tintcheck() adds these up for eye covering locations

-life.dm uses this new proc when checking to apply the welder overlay
instead of hardcoded if statements
2015-04-13 17:57:38 -07:00
Tigercat2000
f3c9a558e2 Fixes an oversight with NO_BREATHE and corpses
This fixes:
 - Issue #778 on https://github.com/ParadiseSS13/Paradise

There was no sanity checking to test if mobs in range of a corpse have
the NO_BREATHE flag. This commit adds such a check. It does not make
sense for species like machine people to vomit. It may make sense for
Slime People and Dionae, but, after all, it's sentient slime and a tree
thing. Are they are even capable of regurgitating their food?
2015-04-13 11:44:14 -07:00
Tigercat2000
29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
ZomgPonies
c922b1229b Merge pull request #786 from Fox-McCloud/brain-damage
Universal Brain Damage
2015-04-12 04:35:59 -04:00
ZomgPonies
efc1bdef21 Merge pull request #785 from Fox-McCloud/telearmor
Buffs Reactive Tele-Armor
2015-04-12 04:35:50 -04:00
ZomgPonies
f7d8df5aef Merge pull request #777 from Fox-McCloud/foods
[Goonchem] Food Reagents
2015-04-12 04:35:14 -04:00
Tigercat2000
f3dd9d5e82 Fix runtime error with handle_heartbeat()
Fixes this runtime error:
//-------------------------------------------------\\
|| runtime error: Cannot read null.status          ||
|| proc name: handle heartbeat                     ||
|| (/mob/living/carbon/human/proc/handle_heartbeat)||
|| source file: life.dm,1648                       ||
\\-------------------------------------------------//

This was caused by no sanity check to make sure that
internal_organs_by_name actually returned an organ, therefore it was
attempting to read a null variable, which causes a runtime error.
2015-04-11 11:43:35 -07:00
Fox-McCloud
6507ddb674 Universal Brain Damage 2015-04-11 05:44:06 -04:00
Fox-McCloud
718ad57231 Buffs Reactive Tele-Armor 2015-04-11 03:33:49 -04:00
Fox-McCloud
286a1ad5df [Goonchem] Food Reagents 2015-04-10 04:46:50 -04:00
ZomgPonies
5108942ed9 Merge pull request #752 from TheDZD/smoke
Chemistry Smoke Changes
2015-04-08 16:55:03 -04:00
DZD
810d626700 Smoke changes
- Changes smoke so that it immediately affects all mobs in its area of
effect, smoke clouds are purely visual.
- Any mobs in the area of effect of a smoke reaction will be affected by
the smoke's touch reaction, and have all reagents in the smoke container
transferred into them.
- Smoke clouds are no longer opaque.
- Mixing 10u potassium, 10u sugar, and 10u phosphorus or higher will
cause an area of effect with a radius of 3 from the point of reaction.
Any less will have a radius of 2.
- Same with heating 10u smoke powder.
- Smoke powder reaction now only yields 1 powder instead of 3.
- Vent clog event has a radius 3 area of effect.

Fixes and uncommenting

- Uncomments honey turf reaction.
- Uncomments synthflesh turf reaction.
- Adds list for reagents to not copy via smoke (or more specifically,
delete when a smoke reaction happens without copying). This includes
sugar, phosphorus, potassium, and the smoke "reagent" produced in a
smoke reaction.
2015-04-07 20:30:01 -04:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
ZomgPonies
4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
jack-fractal
a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Fox-McCloud
46f2b24a75 Merge pull request #744 from ZomgPonies/limb
Organs/Surgery Fixes
2015-04-06 18:15:56 -04:00
ZomgPonies
85a8a7a35f Fixes cane speed exploit 2015-04-06 18:09:52 -04:00
Fox-McCloud
9ca8def744 [Goonchem] Fixups 2015-04-05 21:56:59 -04:00
Fox-McCloud
7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies
cafbb8035c microfix 2015-04-05 14:47:51 -04:00
ZomgPonies
91cb7b8b32 Final fixes 2015-04-04 23:30:49 -04:00
VelardAmakar
4dc73ce9af Added ~15~ 12 new hair options courtesy of Fury McFlurry 2015-04-05 04:20:26 +02:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud
1a81836556 Lethal Brain Damage 2015-04-04 01:51:04 -04:00
ZomgPonies
d4a658ba48 Merge pull request #715 from Fox-McCloud/few-reagents
[Goonchem] Few New Reagents
2015-04-02 21:32:28 -04:00
ZomgPonies
c3a2916d85 Merge pull request #711 from tigercat2000/Spesswormoverhaul
Spaceworm overhaul (-tg-port)
2015-04-02 14:07:41 -04:00
Fox-McCloud
3bcbd2488c [Goonchem] Few New Reagents 2015-04-02 05:04:20 -04:00
Tigercat2000
e05ff3335f add factions 2015-04-02 03:28:41 +02:00
Fox-McCloud
cd5649e522 Fixes Dead People Vomitting 2015-04-01 19:29:06 -04:00
Tigercat2000
f837edf180 Spaceworm overhaul 2015-04-01 03:13:48 +02:00
Fox-McCloud
6cf727d50a SR fixup 2015-03-31 01:11:11 -04:00
Fox-McCloud
595fb2a34c [Goonchem] Pipettes, Fixes, and Tweaks (again) 2015-03-31 00:16:58 -04:00
ZomgPonies
7262eace42 Merge pull request #700 from Fox-McCloud/more-goontweaks
[Goonchem] Even More Tweaks and Fixes
2015-03-29 20:22:12 -04:00
Fox-McCloud
ae9fc03548 Disables Perma-Spinning (for now) 2015-03-29 19:05:59 -04:00
Fox-McCloud
d44688f7b9 [Goonchem] Even More Tweaks and Fixes 2015-03-29 17:57:12 -04:00
Fox-McCloud
27b5d5bb9f Merge pull request #671 from ZomgPonies/limb
Much downgraded Limb Overhaul
2015-03-29 00:44:03 -04:00
ZomgPonies
315d9572be Turn explosion delimbs into amputations due to explosion code overhaul 2015-03-29 00:40:09 -04:00
ZomgPonies
fb988a1f36 Revert limb damage not counting towards overall health 2015-03-28 23:58:44 -04:00
ZomgPonies
46aaed0ca9 Merge pull request #694 from TheDZD/minor-fixes
Bugfixes and Custom Food Sanity
2015-03-28 23:24:17 -04:00
ZomgPonies
7dc292f472 Merge pull request #696 from Fox-McCloud/Goon-tweaks
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 23:23:47 -04:00
Fox-McCloud
d4de91ce15 You Spin Me Right Round 2015-03-28 23:17:00 -04:00
Fox-McCloud
796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
DZD
c2551db339 Diona nymph hivemind fix and custom food
- You can now only put food into custom food, no more "the fire
extinguisher glass shard telescopic baton personal pizza"
- Fixes nymphs being able to learn hivemind languages.
2015-03-28 19:26:53 -04:00
Fox-McCloud
a98b79728d formaldehyde 2015-03-28 06:08:32 -04:00
Iamgoofball
4a88b9b3f7 OOP shock and reagents, buffs overdose effects on meth, too many yakkity saxxers 2015-03-27 17:57:11 -07:00
Fox-McCloud
a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Fox-McCloud
42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
ZomgPonies
71b2c1621a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into limb
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2015-03-25 15:16:51 -04:00