Commit Graph

26250 Commits

Author SHA1 Message Date
Alffd
352fde7eed SQL version control 2017-07-16 19:53:09 -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
tigercat2000
355e18fb91 Merge pull request #7801 from imsxz/syndie-soft-suit-description
Makes syndie soft suit and helmet have the same description
2017-07-15 06:06:01 -07:00
Fox-McCloud
5a93390291 Fixes Blood Math 2017-07-15 05:10:33 -04:00
imsxz
3b426ed3f0 fixes stupid mistake that I didn't make 2017-07-14 22:38:25 -04:00
tigercat2000
c77f71be4d Merge pull request #7794 from Fox-McCloud/iv-drip-fix
Fixes IV Drip Runtime
2017-07-14 19:17:50 -07:00
Fox McCloud
358e75648a Merge pull request #7780 from Kyep/missile_fix
Fixes mech missile launchers
2017-07-14 22:15:55 -04:00
tigercat2000
403417a5b5 Merge pull request #7798 from Fox-McCloud/blood-runtime-fix
Fixes Blood Runtime
2017-07-14 19:14:54 -07:00
Fox-McCloud
5073247210 lips 2017-07-14 21:46:48 -04:00
imsxz
f1f9d8c1e1 fixes stupid mistake 2017-07-14 11:34:29 -04:00
imsxz
bc2684d86b Makes syndie soft suit and helmet have the same description 2017-07-14 11:23:38 -04:00
Kyep
88faca369e New fix method: delete thrower=chassis arg 2017-07-14 02:34:24 -07:00
Fox-McCloud
3c54268801 Fixes Blood Runtime 2017-07-14 01:04:19 -04:00
Fox-McCloud
d27a2efb70 Fixes IV Drip Runtime 2017-07-13 22:46:57 -04:00
Fox-McCloud
d35a5ea6e3 virus immunity trait not var 2017-07-13 19:47:23 -04:00
Fox-McCloud
a7249cf930 cult blade runtime fix 2017-07-13 19:23:22 -04:00
Fox-McCloud
b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04:00
tigercat2000
7819994f92 Merge pull request #7762 from Fox-McCloud/blood-refactor-fixes
Blood Refactor Fixes
2017-07-13 14:37:07 -07:00
Kyep
57c5986760 More OOP 2017-07-13 01:13:59 -07:00
Kyep
d6d558b6f8 Fixes mech missile launchers 2017-07-13 00:14:45 -07:00
Fox McCloud
7626942fce Merge pull request #7724 from shazbot194/Honk
Adds in the Jolly Jug
2017-07-12 23:26:51 -04:00
Fox-McCloud
0401e4fe6e faster blood metabolization 2017-07-12 18:38:04 -04:00
Fox-McCloud
ecfaa6ab71 oh boy 2017-07-12 17:55:42 -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
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