Commit Graph

7770 Commits

Author SHA1 Message Date
Fox-McCloud
46b8b05b10 Can Point While Lying Down 2017-07-23 04:25:46 -04:00
Crazy Lemon
6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloud
7cda52c713 Merge pull request #7818 from Crazylemon64/item_stumbling
Item stumbling refactor
2017-07-22 01:55:19 -04:00
Fox McCloud
b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00
Crazylemon64
807084e304 Most of fox's changes 2017-07-21 15:20:12 -07:00
Fox-McCloud
1ecd7f13fc instant updates 2017-07-21 02:19:12 -04:00
Fox-McCloud
02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
tigercat2000
e0dad32b50 Merge pull request #7806 from Fox-McCloud/FUCK-YOUR-CUNT-YOU-SHIT-EATING-CUNT-TILL-YOU-ARE-A-MASS-EATING-SHIT-CUNT-EAT-PENISES-IN-YOUR-FUCK-FACE-AND-SHIT-OUT-ABORTIONS-TO-FUCK-UP-SHIT-IN-YOUR-ASS-YOU-COCK-FUCK-SHIT
Removes Bay's Wound System
2017-07-19 14:13:49 -07:00
Fox-McCloud
0225f7637c styling 2017-07-19 17:07:37 -04:00
Fox-McCloud
b3d9551fc1 cleans up examine 2017-07-18 05:28:13 -04:00
Crazy Lemon
f7fc505689 Merge pull request #7821 from Fox-McCloud/blood-volume
Limits BLood Volume to 560
2017-07-17 22:30:05 -07:00
Fox-McCloud
5bba6c70f7 Limits BLood Volume to 560 2017-07-18 00:10:43 -04:00
Fox McCloud
e04756c6fb Merge pull request #7808 from Ataman/nymph_fix
Make diona nymphs space worthy
2017-07-16 22:34:48 -04:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
Crazylemon64
3a00e0f083 Fixes for numerous runtimes 2017-07-16 14:42:11 -07:00
Fox-McCloud
2c4952b803 finally 2017-07-16 04:07:54 -04:00
Fox-McCloud
93abbe25a4 BURNNNNNNN 2017-07-15 23:43:51 -04:00
Ataman
f8eff41c7e Adds minbodytemp and atmos_requirements to nymphs 2017-07-16 01:05:16 +02:00
Fox-McCloud
cb35d1f6e9 Binsult.ogg 2017-07-15 12:12:59 -04:00
KasparoVy
4aef59547b Not so funny anymore! 2017-07-15 09:58:27 -04:00
KasparoVy
9104506a2a Vamp Shapeshift/DNAScrambler Fixes & Desnowflakes Prefsetup
Fixes a bug with Vampire Shapeshift where you didn't get a name appropriate to your species and clarifies that you won't be taking on another species using this ability.
Ensures you won't be taking on another species using this ability by circumventing an exploit whereby someone could change their species in game preferences, shapeshift, and be another species.
Fixes a bug with DNA scramblers whereby you wouldn't get a name appropriate to your species. Adds marking resetting for consistency.
Desnowflakes preferences_setup.dm like I had done with preferences.dm.
2017-07-15 09:58:26 -04:00
Fox-McCloud
5a93390291 Fixes Blood Math 2017-07-15 05:10:33 -04:00
Fox-McCloud
5073247210 lips 2017-07-14 21:46:48 -04:00
Fox-McCloud
d35a5ea6e3 virus immunity trait not var 2017-07-13 19:47:23 -04:00
Fox-McCloud
b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04:00
Fox-McCloud
ac32b14910 fix 2017-07-12 03:52:56 -04:00
Fox-McCloud
e02946f3e7 Blood Refactor Fixes 2017-07-12 02:14:53 -04: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
tigercat2000
a4159745ef Merge pull request #7694 from Fox-McCloud/instruments
Instruments Refactor and Electric Guitars
2017-07-10 13:24:52 -07: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
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
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
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox McCloud
352094ae21 Merge pull request #7669 from Vivalas/sec_hud
Tweaks SecHUDs
2017-07-04 14:56:43 -04: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
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
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
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