Commit Graph

2032 Commits

Author SHA1 Message Date
Fox McCloud
3a2544319a Merge pull request #7833 from Crazylemon64/oraoraoraoraoraora
Admins can now set a var to allow a mob to spam-attack
2017-08-06 09:28:53 -04:00
Crazylemon64
9b780a6b5b Admins can now set a var to allow a mob to spam-attack 2017-08-05 07:25:52 -07: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
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Kyep
de56e4bf59 Removed is_hunter_outfit 2017-07-19 02:03:21 -07: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
7626942fce Merge pull request #7724 from shazbot194/Honk
Adds in the Jolly Jug
2017-07-12 23:26:51 -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
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
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
Fox-McCloud
4c6fe418bf Removes A* call and Fixes Blood Virus Infections 2017-07-07 02:58:34 -04:00
shazbot194
c9c3cf3527 Adds in the Jolly Jug
Due to my master exploding, I had to remake a couple of my PRs. This
pull adds in the Jolly Jug, the clown version of nothing. The clown
spawns with it and has a backup in their locker, just like the mime, in
addition it spawns with 100u of banana juice.
2017-07-05 17:36:30 -08:00
Fox-McCloud
354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -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
c34bb8c53f Merge pull request #7681 from Birdtalon/traitoechem
Gives traitor medical chemists access to the poison bottle uplink item.
2017-07-04 11:18:08 -07: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
08c8ba569c Adds Radio Jammers 2017-06-30 18:20:21 -04:00
Birdtalon
7207de2d33 Re-ordered the list 2017-06-30 22:19:31 +01:00
Lee Brandon
706e552a92 Updated uplink_item.dm to allow medical chemist access to traitor poison bottle. 2017-06-30 21:12:23 +01:00
Fox-McCloud
bcda610cc0 Refactors Syndicate Bombs 2017-06-29 18:10:58 -04:00
Fox McCloud
f972d0a668 Merge pull request #7616 from SamHPurp/coroner-antag-items
Allows coroner to use Medical antag items & Chef to get antag poison bottles
2017-06-27 16:35:43 -04:00
Fox McCloud
2e25253d0b Merge pull request #7640 from Kyep/gimmick_team
Adds Jani-ERT, Paranormal ERT, and Gimmick Teams in general
2017-06-27 16:32:26 -04:00
Fox McCloud
5aa7306c16 Merge pull request #7614 from SamHPurp/adds-rolling-pins
Adds rolling pins to the kitchen equipment crate
2017-06-27 16:00:44 -04:00
tigercat2000
e238e5b7bc Merge pull request #7565 from imsxz/removes-singualrity-beacon-from-surplus-crate
Removes singularity beacon from surplus crate
2017-06-27 11:37:50 -07:00
Kyep
62bc56a080 Adds jani/paranormal ERT and more 2017-06-26 01:55:15 -07:00
Kyep
ce48a277df Support protective hunters, guardian/pet blessings 2017-06-24 00:04:15 -07:00
Sam
37372b0337 pfft 2017-06-23 19:35:22 +01:00
Sam
62a1353f12 tidies up uplink_item and adds Coroner and chef uses 2017-06-23 08:58:58 +01:00
Sam
a6615834ff SUPER IMPORTANT PR 2017-06-23 07:26:47 +01:00
tigercat2000
3e379b8f36 Merge pull request #7460 from Crazylemon64/soullink_port
Soullink port + Cloning tweak
2017-06-22 16:30:42 -07:00
tigercat2000
4c07d792cd Combat Tentacles
New Changeling evolution, combat tentacles! 2 points, 10 chems per
tentacle formed.
2017-06-19 11:00:36 -07:00
Kyep
e324a73fc2 Fixes reaper outfit briefcase 2017-06-19 00:12:48 -07:00
Kyep
250b64edb2 Changes Dark Priest to Hunter 2017-06-18 23:48:51 -07:00
Sam
0f006dbbb4 Refactors posters 2017-06-17 02:08:13 +01:00
imsxz
1774148d9a removes singularity beacon from surplus crate 2017-06-16 13:01:15 -04:00
Fox McCloud
7bad22d593 Merge pull request #7467 from Kyep/more_smiting
More Smiting
2017-06-09 19:38:09 -04:00
Fox McCloud
0742cfd6c3 Merge pull request #7504 from Kyep/shuttle_compartment
Adds dept shuttle
2017-06-09 15:41:53 -04:00
Kyep
9837c04eb5 Changes DP's explosive implant to dust implant 2017-06-08 22:14:27 -07:00
Kyep
e29bd33637 DP's Radio & Pinpointer are now NODROP. 2017-06-08 22:12:56 -07:00
Kyep
7b481ed13d Adds dept shuttle 2017-06-08 01:08:19 -07:00
Fox McCloud
aa1a1c79e0 Merge pull request #7496 from Alexshreds/vision
Adds Missing Disease Symptoms Take 2
2017-06-08 00:26:49 -04:00