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
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
Mark van Alphen
a9c424ca7c
Merge pull request #2419 from Crazylemon64/sleeper_ui
...
Sleeper NanoUI
2015-10-28 02:43:39 +01:00
Tigercat2000
0061844a77
No humans, you do not need to update action buttons twice
2015-10-27 06:19:25 -07:00
Tigercat2000
206f7079df
Clean up mob code a bit
...
Does the following:
- Cleans up how gravity works, a little bit
- Pushes duplicated procs for slimes/xenos/humans up to carbon/Life()
- carbon/Life() is now a thing, it handles the non-special stuff for all
carbons
- Mob controller no longer ticks a seperate entity, mob_master is now
just a reference to the mob process, which ticks.
2015-10-27 06:19:24 -07:00
Fox McCloud
2aed207eb4
Merge pull request #2410 from Crazylemon64/conscious_scream
...
Dead humans are now no longer able to emote
2015-10-25 16:33:40 -04:00
Crazylemon64
9e0e68a8b6
Sleepers now use NanoUI
...
Also cuts out a few points of weirdness; No dialysis on bloodless races
like IPCs, and dialysis on simple_animals is no longer possible through
the interface or through href twiddling, as that caused a runtime.
Also, prevents href tweaking to dispense chemicals the sleeper doesn't
have.
2015-10-25 10:35:39 -07:00
Crazylemon
95e574d4d5
Moves around the deathgasp emote in the human death proc
...
This should prevent the death check from stopping our dying gasp
2015-10-23 15:16:58 -07:00
Crazylemon
aa1186ae2d
Dead humans are now no longer able to emote
2015-10-23 14:57:18 -07:00
Fox McCloud
e78b952bff
Merge pull request #2396 from KasparoVy/master
...
Adds More Vox Hair (Head+Facial)
2015-10-21 03:57:19 -04:00
KasparoVy
931d053b1d
Adds More Vox Hair (Head+Facial)
...
A straight-up port from VG. Saw that someone on Bay went for it and this
was the first I've seen of VG's different Vox hairstyles so I figured
I'd make a pull here too.
I know some of these look weird, so if there's any that you absolutely
don't want in, just specify them and I'll axe it.
2015-10-19 20:02:21 -04:00
Tigercat2000
633a9e68b4
Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
^ This shit is haunted. It's conflicted on two branches for 0
reason, the automatic merge wouldn't work on the fucking end of
file.
2015-10-19 16:13:51 -07:00
TheDZD
7908591af3
Merge pull request #2386 from Fox-McCloud/reagents-seeing
...
Reagent Scanner/Seeing
2015-10-19 18:53:45 -04:00
Fox-McCloud
6d2a2f3eba
tweaks
2015-10-19 17:20:35 -04:00
Aurorablade
1404c88229
fixes
...
will still need to look at using transfer_to and the language key
2015-10-19 08:27:06 -04:00
Aurorablade
3a2590261b
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2
2015-10-18 21:37:28 -04:00
