Commit Graph

16253 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
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
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
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
tigercat2000
3b5283a29b Merge pull request #7730 from Fox-McCloud/projectile-reflect
Projectile Reflection Refactor
2017-07-08 17:34:08 -07: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
Fox-McCloud
922888c753 Human Radiation Rework 2017-07-08 00:13:57 -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
6bc9c95042 target acquired: terminate 2017-07-05 17:04:02 -04:00
Fox-McCloud
641af24a2d Removes a bunch fo Spawns in Life 2017-07-05 16:32:22 -04:00
Fox-McCloud
b6a5ffd8ff Makes ListTargets Much Faster 2017-07-04 23:04:20 -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
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
tigercat2000
fef7abc867 Merge pull request #7672 from Fox-McCloud/syndicate-bomb-refactor
Refactors Syndicate Bombs and Adds Chemical Bombs
2017-07-04 11:53:55 -07:00
tigercat2000
c2b3b1adaa Merge pull request #7682 from Fox-McCloud/radio-jammer
Adds Radio Jammers
2017-07-04 11:33:40 -07:00
tigercat2000
1ae7f2930c Merge pull request #7689 from Fox-McCloud/thats-the-power-of-love
🎵 That's the Power of Love🎵
2017-07-04 11:15:32 -07:00
Crazy Lemon
460f0704b6 Merge pull request #7675 from Ionward/GreySpriteMania
grey sprite overhaul
2017-07-04 11:13:41 -07:00
Crazy Lemon
a276d1a49a Merge pull request #7684 from Citinited/m-m-m-my-coroner
Adds a plasmaman suit for coroners, geneticists, and virologists
2017-07-04 11:11:35 -07:00
Crazy Lemon
b8d5d530b4 Merge pull request #7690 from Aurorablade/VeryImportentMedicalGear
Adds in an importent piece of medical gear
2017-07-04 11:08:56 -07:00
Fox-McCloud
0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -04:00
fludd12
58520a69a9 Fixes two things 2017-07-02 01:30:25 -04:00
Aurorablade
97252cd2f8 MEdicalgear 2017-07-01 22:55:40 -04:00
Fox-McCloud
4492b5ece3 That's the Power of Love~ 2017-07-01 22:07:44 -04:00
Citinited
8bc0eff40c Adds the virologist and geneticist plasmaman suits 2017-07-02 02:40:58 +01:00
Fox-McCloud
666fff6e4a useless bullet removal 2017-07-01 20:38:58 -04:00
Fox-McCloud
e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Citinited
16dbf9012c Adds a plasmaman suit for coroners 2017-07-01 17:54:20 +01:00
Fox-McCloud
04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Fox-McCloud
bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Ionward
5de53b72b4 fixes missing medical breathmask and syndihelm
ye boy
2017-06-30 21:31:15 -07:00
Fox-McCloud
8e9eae8341 other "radios" 2017-07-01 00:14:36 -04:00
Fox-McCloud
08c8ba569c Adds Radio Jammers 2017-06-30 18:20:21 -04:00
tigercat2000
96bd0b80e0 Merge pull request #6516 from fludd12/Grey-Rework
Grey Rework
2017-06-30 08:29:31 -07:00
Ionward
4f0b4f78e3 Grey Sprite Overhaul
[First time I've done this, bare with me]

Overhauled existing and added new sprites for Grey heads (helmets,
masks, and glasses), and enables more Grey sprites.

((is this how i update a pr oh god))
2017-06-30 02:28:41 -07:00
Fox-McCloud
426c39ef3f Icon Fixes 2017-06-30 03:21:12 -04:00