Commit Graph
7135 Commits
Author SHA1 Message Date
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
taukausanake 730cfd3d2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into buffs_duffs 2017-07-19 22:08:40 -05:00
tigercat2000andGitHub 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 e9e1f2de8e remove that button! 2017-07-19 12:20:36 -04:00
Fox-McCloud 77375fc1c4 Breathing is Now Handled on Lungs 2017-07-19 03:28:21 -04:00
Crazylemon64 a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
FlattestGuitar ead42d5a27 Merges conflicts 2017-07-16 23:58:43 +02:00
Crazylemon64 3a00e0f083 Fixes for numerous runtimes 2017-07-16 14:42:11 -07:00
Fox-McCloud cb35d1f6e9 Binsult.ogg 2017-07-15 12:12:59 -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 3deaf6ece8 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-15 06:20:26 -04:00
Fox-McCloud 599c686e9c Removes Cryostasis Bags 2017-07-13 22:21:54 -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
AurorabladeandFox McCloud 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 McCloudandGitHub 23ee7f02d5 Merge pull request #7567 from SamHPurp/re-factors-posters
Refactors posters
2017-07-10 18:48:21 -04:00
tigercat2000andGitHub a4159745ef Merge pull request #7694 from Fox-McCloud/instruments
Instruments Refactor and Electric Guitars
2017-07-10 13:24:52 -07:00
Fox-McCloud 17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
tigercat2000andGitHub 782158d9ab Merge pull request #7709 from Fox-McCloud/mopping-up
Buffs Advanced Mop
2017-07-08 17:52:48 -07:00
CitinitedandFox McCloud 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
taukausanake ee9e662179 Atmospherics duffel bag and duffel edits
Creates a new duffel bag for Atmospherics. It is a resprite of the Engineering bag with light blue lines on it and a dark blue strap.
Also adds colored strips to each of the Medical duffels (Chem, Gene, Viro) as well as to Toxins as they seemed a little lacking in their special color. Can undo if desired as they are different from before but the same between all sprite types.

In-hand and on-mob sprites have been updated accordingly. Atmos duffel bag spawns in Atmospherics "technician's locker". There was also a missing toxins duffel bag icon for both in-hand DMIs while each other bag had one so I made those too.
2017-07-06 02:13:54 -05: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
Crazy LemonandGitHub 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
tigercat2000andGitHub 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
tigercat2000andGitHub c2b3b1adaa Merge pull request #7682 from Fox-McCloud/radio-jammer
Adds Radio Jammers
2017-07-04 11:33:40 -07:00
Crazy LemonandGitHub c69a8c4f70 Merge pull request #7677 from Aurorablade/TeleportFix
Hand Tele bug fix
2017-07-03 14:08:43 -07:00
Fox-McCloud 0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -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
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
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
Fox-McCloud 426c39ef3f Icon Fixes 2017-06-30 03:21:12 -04:00
Aurorablade 70b1a0c826 bugfix 2017-06-30 03:16:12 -04:00
Fox-McCloud 5bc6e36756 helpers 2017-06-29 20:14:29 -04:00
Fox-McCloud d3b04e2638 oops 2017-06-29 20:10:13 -04:00
Fox-McCloud b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
Aurorablade 818f9a0f40 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-06-28 22:10:08 -04:00
Fox-McCloud e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud 585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
tigercat2000andGitHub 2c935a9a31 Merge pull request #6940 from Citinited/pipe-dreams-travis-woo
Adds the Rapid Pipe Dispenser (RPD)
2017-06-27 13:32:59 -07:00
tigercat2000andGitHub add07e305c Merge pull request #7595 from Fox-McCloud/augmenting-and-selection
Adds in Limb Augmentation and Limb Company Selection
2017-06-27 12:28:16 -07:00