Commit Graph

4093 Commits

Author SHA1 Message Date
Crazy Lemon
59a9df3762 Merge pull request #7906 from Fox-McCloud/remove-cael
Removes Unused Xenoarch Code
2017-08-01 22:15:22 -07:00
Fox-McCloud
968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Fox-McCloud
38edeada02 Chem Grenades Log Reagents 2017-07-28 00:56:37 -04:00
Fox-McCloud
81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
Fox McCloud
98ad0cdb76 Merge pull request #7523 from FlattestGuitar/no-stel-ples
Removes boring theft objectives
2017-07-25 14:55:37 -04:00
Crazy Lemon
e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
Fox McCloud
d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Crazy Lemon
da7bea7c61 Merge pull request #7850 from Fox-McCloud/reagenttssss
Reagents Cleanup
2017-07-25 03:43:17 -07:00
Fox-McCloud
89ff21c755 Fixes Health Implants 2017-07-23 17:26:37 -04:00
Fox-McCloud
4419683890 Reagents Cleanup 2017-07-22 05:18:13 -04:00
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -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
Crazylemon64
88edf50be3 Agh why did it stick spaces in there 2017-07-21 22:45:20 -07:00
Crazylemon64
e0178ff8fd Final changes 2017-07-21 22:27:50 -07:00
Fox McCloud
b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00
Crazylemon64
50d5e18ef6 Moves soap into a single file 2017-07-21 15:20:23 -07: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
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
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
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
tigercat2000
782158d9ab Merge pull request #7709 from Fox-McCloud/mopping-up
Buffs Advanced Mop
2017-07-08 17:52:48 -07: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
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 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
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
Crazy Lemon
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