Commit Graph

5624 Commits

Author SHA1 Message Date
Fox-McCloud
86cdf5ec23 Fixes Health HUD Icon 2015-11-18 16:22:15 -05:00
Fox McCloud
d07bce4a66 Merge pull request #2515 from Spacemanspark/master
Adds in toy chainsaws.
2015-11-18 14:04:17 -05:00
Fox McCloud
54bdd47661 Merge pull request #2584 from ZomgPonies/copier
Re-added photocopying asses to refactored photocopiers
2015-11-18 12:52:42 -05:00
ZomgPonies
60aad98ef4 Cleaned up species code, remove naked requirement 2015-11-18 11:55:30 -05:00
ZomgPonies
3756d5457e Adds species-specific butts and fixes a few bugs 2015-11-18 10:16:26 -05:00
Fox McCloud
63cec575cf Merge pull request #2576 from tigercat2000/IM_GOING_TO_FUCKING_GO_INSANE_GODDAMNIT
Cleaning time, x1.
2015-11-17 18:58:34 -05:00
Fox McCloud
d440f9df3f Merge pull request #2578 from FalseIncarnate/master
Overdose Change, Reagent Tweaks and Fixes, IPC Damage Fixes
2015-11-17 17:30:11 -05:00
Tigercat2000
46901d74b2 Merge remote-tracking branch 'upstream/master' into IM_GOING_TO_FUCKING_GO_INSANE_GODDAMNIT
Conflicts:
	code/game/gamemodes/meteor/meteor.dm
2015-11-16 14:28:27 -08:00
FalseIncarnate
cd1527a05f Overdose Change, Reagent Tweaks and Fixes, IPC Damage Fixes
Adjusts how Overdosing works
- Overdose effects now stop if you have less than the overdose threshold
for the given reagent in your system
- Previously, overdose effects would continue until all of the reagent
was removed from the body
- After dropping below the overdose threshold, reagents will process as
normal as long as they do not surpass the threshold again.

Tweaked some Synthetic-oriented reagents
- Synthetic drugs no longer will cause Toxins damage
- The toxins damage for these has been replaced with either another form
of damage or side-effect
- Degreaser no longer cures Toxins Damage in Synthetics
- Degreaser still acts as a chemical purgative and lube cleaner, but
helps cure certain side-effects much like Coffee does for organics.

Sterlizine recipe changed to require antihol and chlorine
- Effectively the same as the old recipe, except actually mixable
- Fixes #2030

Increases max_damage of MMI Holders to 200 (from 60)
- Now matches the max_damage for organic brains
- Should make IPC brain damage more consistent with organic brain damage

Gives IPCs the NO_POISON flag
- This should make IPCs immune to toxins damage again, as intended
originally.
- Fixes #2151.
2015-11-16 16:37:33 -05:00
Tigercat2000
d543528390 Mob cleanup x1
Changes:
 - Human Bump() code cleansed.
  - Drones have been unsnowflaked from the Bump(), they are now density 0.
    Happy side effect; they can walk under people now.
 - Human attack_alien() code cleansed.
  - Mostly shitty insane checks.
 - Human damage/husking code cleansed.
  - More shitty insane if statements.
 - Human retarded speech moved out of insanely long pick() proc, made into
   lists.
2015-11-16 11:48:36 -08:00
Crazylemon
6927c6164a IPCs now heal in an upgraded cyborg recharger
Upgrading the recharger cell will also increase how fast IPCs recharge
2015-11-15 15:38:45 -08:00
Tastyfish
45a339069d Lets parrots speak on Common radio, as code intended. 2015-11-14 15:30:10 -05:00
Tigercat2000
9101157b1b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
2015-11-14 07:01:36 -08:00
TheDZD
dfde703d50 Merge pull request #2536 from Fox-McCloud/stamina-fix
Fixes Stamina
2015-11-14 09:29:10 -05:00
tigercat2000
e4d4bfc899 why humans why 2015-11-13 20:55:24 -08:00
Tigercat2000
27a011e44f fix stunned shit 2015-11-13 20:47:18 -08:00
Fox-McCloud
fc9aff7128 Fixes Stamina 2015-11-13 23:15:36 -05:00
Tigercat2000
0bb6f36e4a Fixes medhud/sechud/etc shit, ai life refactor
Dear god please nuke AI code from the face of this earth.
2015-11-13 07:28:45 -08:00
Tigercat2000
9e5e81325e Fix Vision code weirdness 2015-11-12 17:47:33 -08:00
Tigercat2000
056585399b Fix carbon/Life()
yeah whoops
APPARENTLY BAY HAD LIVING/LIFE() AND CARBON/LIFE()
damnit bay
2015-11-12 16:53:41 -08:00
Tigercat2000
9186d94ba1 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	icons/mob/suit.dmi
2015-11-11 16:51:44 -08:00
Spacemanspark
df882e5d4b Removes the toy chainsaw statement from human_defense. 2015-11-10 19:06:48 -06:00
Spacemanspark
f8f8f95fbe Prevents toy chainsaws from making dead people into meat. 2015-11-10 15:55:20 -06:00
Fox McCloud
4325daaabc Merge pull request #2497 from tigercat2000/html5_stuff
HTML5, IE11, CSS3
2015-11-09 20:59:14 -05:00
DZD
22c53438b9 Fixes broken hunter pounce caused by armor change. 2015-11-08 14:23:20 -05:00
Tigercat2000
29f42f8b61 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm
2015-11-07 20:54:24 -08:00
Fox McCloud
cc6dcd72bb Merge pull request #2468 from tigercat2000/tg-life
-tg- Life() refactors
2015-11-07 23:08:01 -05:00
Tigercat2000
77cdaedb42 Merge remote-tracking branch 'upstream/master' into html5_stuff 2015-11-07 19:20:45 -08:00
Fox McCloud
d7a06fc238 Merge pull request #2487 from TheDZD/ayyliens
Makes xenomorph stuns factor in melee armor
2015-11-07 22:19:33 -05:00
TheDZD
6deffa0535 Merge pull request #2489 from Fox-McCloud/circuit-board-pathing
Circuit Board Repathing and Swarmer Fixes
2015-11-06 21:51:39 -05:00
Fox McCloud
06862ceceb Merge pull request #2475 from Crazylemon64/drone_trays
Adds a t-ray scanner to the drone's equipment set
2015-11-06 21:32:10 -05:00
Fox-McCloud
16a208f545 Circuit Board Repathing and Swarmer Fixes 2015-11-06 21:21:36 -05:00
TheDZD
9f6111d4f9 Merge pull request #2480 from Fox-McCloud/armor-fix
Armor Fix
2015-11-06 20:50:01 -05:00
DZD
66974661b8 Makes xenomorph stuns factor in the target's melee armor instead of always stunning for a full 5 seconds. 2015-11-06 20:44:24 -05:00
Tastyfish
fd2bfbacbe fixed newline convention 2015-11-06 15:52:26 -05:00
Tastyfish
eb519c11d8 Fixed punpun not getting his suit equiped correctly, thus not getting his sprite updated. 2015-11-06 15:50:15 -05:00
Tigercat2000
d36352ae7c HTML5 and CSS3 for NanoUI + Datum Browser 2015-11-06 11:27:32 -08:00
Fox-McCloud
fd0417f4cb Armor Fix 2015-11-06 08:06:29 -05:00
Crazylemon
fdb32aa29f Adds a t-ray scanner to the drone's equipment set 2015-11-05 12:27:31 -08:00
Tigercat2000
4ba0b2ad37 Remove world output debug shit 2015-11-04 21:16:30 -08:00
Tigercat2000
f62c12d2dc remove epinephrine stuff 2015-11-04 18:21:08 -08:00
Tigercat2000
67e20ff5d5 -tg- Life() refactors
This commit does a *lot*
Main points of shit changed:
 - Breathing for carbons is now partially handled at a carbon/Life()
   level; Humans still use their species bullshit and all.
 - Most shit has been pushed up the chain to living/Life().
 - Simple_animals no longer use the fucking stupid Die() proc, they use
   death() like a consistant fucker.
 - Human vision is now handled via species.
 - Lots and lots of robot copypasta cleaned
  - AI is still a terrifying mess, not even -tg- touches it

I have tested this, and everything I thought to test worked:
 - Aliens breathing
 - Humans breathing
 - Human vision
 - Robot HUD
 - human HUD
 - Simple animals automatic systems
 - Simple animals dying properly
 - Robot goggles working
2015-11-04 16:32:57 -08:00
Tigercat2000
460161008c Critical fix: Simple_animal invincibility.
Also removes Halloss from updatehealth() calculations, it doesn't belong
there, and halloss is deprecated regardless.
2015-11-04 08:58:58 -08:00
TheDZD
0604c8d16e Merge pull request #2325 from Aurorablade/ForTheSwarm2
Fethas Carnival of Horrors part 1.5: Swarmers
2015-11-03 19:20:08 -05:00
Aurorablade
07999f0792 don't code half awake 2015-11-03 15:25:01 -05:00
Aurorablade
05f9c085a6 another change 2015-11-03 08:26:32 -05:00
Tigercat2000
aa86c85b98 Add config option to disable same-CID popup "YOU'LL BE BANNED STOP IT"
This is seriously fucking annoying when testing local changes. Only a
config option instead of being removed completely because I am actually
going to go fucking insane without this being gone.
2015-11-01 20:34:37 -08:00
Aurorablade
c767da2de9 Reviewed TG Simple animal file
made changes.
2015-11-01 07:01:12 -05:00
Tigercat2000
6c020780d9 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
2015-10-29 19:29:28 -07:00
TheDZD
3d3e0f0ccc Merge pull request #2422 from tigercat2000/so_messy
Clean up mob code a bit
2015-10-29 22:22:57 -04:00