Commit Graph

26226 Commits

Author SHA1 Message Date
Kyep
dbfb6a34f5 Placeholders for emagged drones inhand/onhead 2017-07-14 18:53:25 -07:00
Kyep
f5553e2a0b Switches to Kluys' icons 2017-07-13 06:02:47 -07:00
Kyep
7bca8a02a3 Adds syndi drone look 2017-07-13 03:02:13 -07:00
Fox-McCloud
511a8a37b6 Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye 2017-07-11 17:13:47 -04:00
Aurorablade
476cdc3e06 Blood Refactor (#6220)
* commit for branch swap

* branch swap again

* BLEED

* trying to clear up compile errors

* i killed everything when i tested this...

* restorealltheblood

* I REMOVED A THING

* well some progress

* stop bleeding

* got to swap branches again.

* grr

* damn bloodcolors

* Squash everything

* color....colourrrrrrr

* color....colourrrrrrr

* well now that updated the branch...

* Changes

* Some tweaks..before i upload something major

* COLOR NOT COLOUR...COLOR

YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD

* Foot print shit..

blood coloring is going to be PAIN

* trying to handle some colors..maybe.

* blood colorsing sucks..di i mention this?

* commenting cod malfunctions.

* Changes

* lets try this

* Its too late at night.

* blargh

* woops

* almost works...

* progress..

* Branch swap

* figured out the overlay issue....

* BRANCH SWAP

* BLARGH

* fixed merged conflicts..expect something to be horribly wrong.

* bunch of changes

* Major Fixes

 - Moved blood_state and bloodiness var definitions to
 /obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
 order to make blood color work properly.
   - These were not used by any other decal, so it was pointless.
 - Tweaked human/add_blood so that hand_blood_color uses the correct
 value now.
 - Corrected gibs having the wrong basecolor.
 - Tracks of different blood colors will no longer combine weirdly, and
 will instead form seperate overlays.
   - This also fixes all of the issues with tracks in general and not
   updating correctly.
 - Fixed transfering blood in add_fingerprint; the old detective code
 didn't use the new format for add_blood().
 - Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
 own trails. Sprites should probably be brightened later.
 - Fixed mobs occasionally randomly having their blood_DNA list reset.

* may have accidently removed shit.

* Mrowl

* stiff

water is not bleeding
lowered trail making threshold

* tweaks then conflcits

* weee

* indent

* some tweaks

* somefox tweaks.

* derp

* why won't they bleed!?

* BLEED DAMMIT

* Flattist comments and removes simple animale blood volume

Cause i cannot get it to work right.

* PRAISE FLATTIST

* Simple animals have a blood volume now

Bug with trail fixed.

* changes

* thanksmrowlmrowl

* exotice blood trails

* makesure is an exotic bleeder has a bleed rate first...

* FoxBoxTweakSox

* BoxVoxSoXFox

* ONE MORE THING

* animalsbleedreds

* Buh? BUGH!

* thisismescreaming

* removing note needed thing

* Color changes but the rabbit hole continues.

* This is not pretty....

* wot

* IT WORKS DAMMIT

* colors.

* germaphobic commit..

* we have to use the old system

* nothing to see here

* doubleprocarady

* try to fix mulebots

* mulebot fixed

* DONE
2017-07-11 16:49:11 -04:00
Fox McCloud
23ee7f02d5 Merge pull request #7567 from SamHPurp/re-factors-posters
Refactors posters
2017-07-10 18:48:21 -04:00
Sam
ded0acb5f9 adjusted speed 2017-07-10 23:24:14 +01:00
Sam
e0fb2433dd Tweaks for fox 2017-07-10 23:08:08 +01:00
Birdtalon
a53bdb1fb2 Fixes two minor spelling/grammar issues. (#7753)
* Fixes the word "Safety"

* Fixes #7530 - Reformats sentence to be grammatically correct (as best it can be).
2017-07-10 17:37:45 -04:00
tigercat2000
70b808a36e Merge pull request #7728 from Xantholne/HoodieFluff
Xantholne Wintercoat Fluff
2017-07-10 13:28:42 -07:00
tigercat2000
a4159745ef Merge pull request #7694 from Fox-McCloud/instruments
Instruments Refactor and Electric Guitars
2017-07-10 13:24:52 -07:00
Citinited
631cb33804 Fart description is now consistent for all viewers 2017-07-10 21:06:00 +01:00
Citinited
ff78a65ce0 Superfart works again 2017-07-10 20:18:55 +01:00
Xantholne
fe5ba13ffd Removes the cold protection stufff 2017-07-10 07:22:18 -06:00
tigercat2000
ecac7df5df Merge pull request #7739 from Fox-McCloud/radiation
Human Radiation Rework
2017-07-09 14:16:02 -07:00
Fox-McCloud
17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
tigercat2000
93e40b5784 Merge pull request #7731 from Fox-McCloud/virus-fix
Removes A* call and Fixes Blood Virus Infections
2017-07-08 18:02:03 -07:00
tigercat2000
782158d9ab Merge pull request #7709 from Fox-McCloud/mopping-up
Buffs Advanced Mop
2017-07-08 17:52:48 -07:00
TravellingMerchant
291a24541a Adds Sweet and Sour Chicken Balls to the Chinese food vending machine. (#7718)
* Adds chicken ball sprite.

* Defines chicken balls.

* Adds chicken balls to changs.

* Changed description of the chicken balls to Purpose's great pun.
2017-07-08 20:50:46 -04:00
Fox McCloud
1f24a55c8d Removes Old and Unused Podmen File (#7710) 2017-07-08 17:37:13 -07:00
tigercat2000
f81c703846 Merge pull request #7720 from Fox-McCloud/whyyy
Wherein I Grump at Bad Code
2017-07-08 17:34:40 -07:00
tigercat2000
de6d6767c9 Merge pull request #7711 from Fox-McCloud/refactor-wallitems
Refactors Wall Item Placement Checking
2017-07-08 17:34:25 -07:00
tigercat2000
3b5283a29b Merge pull request #7730 from Fox-McCloud/projectile-reflect
Projectile Reflection Refactor
2017-07-08 17:34:08 -07:00
Fox McCloud
de183c591c Merge pull request #7664 from Kyep/flagged_job_fixes_2
Fixes #7657 - really persistent priority jobs
2017-07-08 20:32:06 -04:00
MarcellusPye
0b15e47623 Away mission Central Atmospherics Computer fix (#7633)
* Initial Fix

The pre-round optimisation appears to cause the bug

* Round 2, a bit more optimal

This should be more optimal, the system is still in need of a refactor but this should stop mass load lag.

* Removes githubs numbers

Bad github

* Removed whitespace

Please compile
2017-07-08 20:31:51 -04:00
Citinited
579ce61197 Praise Honkmother! 📯 🤡 (Fixes mime and clown crayons not changing colour) (#7726)
* Fixes mime / rainbow crayons not changing colour as intended

* uses incapacitated() instead of restrained || stat

* Uses Adjacent(usr) to check if rainbow / mime crayons should be able to change colour
2017-07-08 20:26:49 -04:00
tigercat2000
bd7271a36f Merge pull request #7717 from Fox-McCloud/spawn-removal
Removes a bunch fo Spawns in Life
2017-07-08 17:12:06 -07:00
tigercat2000
1cade2a65f Merge pull request #7712 from Fox-McCloud/faster-listtargets
Makes ListTargets Much Faster
2017-07-08 17:11:42 -07:00
Fox-McCloud
922888c753 Human Radiation Rework 2017-07-08 00:13:57 -04:00
Fox-McCloud
4c6fe418bf Removes A* call and Fixes Blood Virus Infections 2017-07-07 02:58:34 -04:00
Fox-McCloud
e29d346198 Projectile Reflection Refactor 2017-07-06 16:29:40 -04:00
Xantholne
bf1310204e Xantholne Wintercoat Fluff 2017-07-06 04:50:46 -06:00
Fox-McCloud
b65658e87b qdel null 2017-07-05 23:20:13 -04:00
Fox-McCloud
8a6f7b86da beep 2017-07-05 17:18:10 -04:00
Fox-McCloud
2206db4150 Wherein I Grump at Bad Code 2017-07-05 17:15:51 -04:00
Fox-McCloud
6bc9c95042 target acquired: terminate 2017-07-05 17:04:02 -04:00
Sam
a0e71daefb Nulls out the var 2017-07-05 22:00:49 +01:00
Fox-McCloud
641af24a2d Removes a bunch fo Spawns in Life 2017-07-05 16:32:22 -04:00
Sam
f808e50ab1 Garbage. Lots of garbage. 2017-07-05 20:45:56 +01:00
Fox-McCloud
b6a5ffd8ff Makes ListTargets Much Faster 2017-07-04 23:04:20 -04:00
Fox-McCloud
226a749ea7 Refactors Wall Item Placement Checking 2017-07-04 22:46:55 -04:00
Fox-McCloud
fe6481f86f Buffs Advanced Mop 2017-07-04 21:45:15 -04:00
Fox-McCloud
42cf53a30f Merge remote-tracking branch 'upstream/master' into instruments 2017-07-04 17:42:24 -04:00
Fox-McCloud
354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04:00
MarcellusPye
1a2db2b146 Initial Change 2017-07-05 08:12:08 +12:00
Crazy Lemon
eab996d107 Merge pull request #7678 from Fox-McCloud/misc-fixes
Icon Fixes
2017-07-04 13:01:23 -07:00
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud
e93e4ef090 IPC arm recharger mechfab 2017-07-04 15:28:14 -04:00
Fox McCloud
2d6157dc12 Merge pull request #7653 from Kyep/gimmick_teams_v2
Gimmick Team improvements
2017-07-04 15:08:09 -04:00
Fox McCloud
352094ae21 Merge pull request #7669 from Vivalas/sec_hud
Tweaks SecHUDs
2017-07-04 14:56:43 -04:00