Commit Graph
4369 Commits
Author SHA1 Message Date
tigercat2000andGitHub f747d4948b Merge pull request #7920 from Fox-McCloud/musics
Adds a Bunch of Instruments
2017-08-28 14:21:39 -07:00
Aurorablade beb021051b fized 2017-08-27 23:55:31 -04:00
Aurorablade 7012b54817 Fixes and tried to add an action button 2017-08-27 22:38:05 -04:00
Birdtalon 0daed1cfe2 adds pineapple and derivatives 2017-08-26 22:07:51 +01:00
Aurorablade 9956a4a90a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-08-23 17:37:22 -04:00
Aurorablade 7558abc0bb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-08-17 19:28:48 -04:00
Aurorablade 06a28a15d0 tiger changes. ONWARD TO MERGE UPDATE 2017-08-17 19:28:20 -04:00
Fox-McCloud 881c0e9d92 Merge remote-tracking branch 'upstream/master' into musics 2017-08-16 19:12:46 -04:00
Fox-McCloud cf4735a069 Merge remote-tracking branch 'upstream/master' into HUNKE 2017-08-16 18:36:30 -04:00
tigercat2000andGitHub ebabda1223 Merge pull request #7366 from KasparoVy/mob_rgb_to_hex
Converts Mob Colours to Hexadecimal
2017-08-16 12:52:13 -07:00
FalseIncarnate 438f4d33ee Fixes cargo point exploit with watertank crate 2017-08-07 22:19:37 -04:00
FalseIncarnate 3ea892b813 Orderable bathroom fixtures and autolathe mirrors
Adds two new crates to supply ordering:

Urination Station Crate, contains one toilet in a box and one urinal in
a box. Costs 10 points.

Hygeine Station Crate, contains one sink in a box and one shower
fixture. Costs 10 points.

Mirrors can now be produced in an autolathe from glass.
2017-08-06 21:31:18 -04:00
Fox McCloudandGitHub 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
Fox-McCloud d7da6cb94c Adds a Bunch of Instruments 2017-08-02 03:19:03 -04:00
Aurorablade 8e5f3102ff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-07-31 17:20:30 -04:00
Aurorablade 84e1fce8b6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-07-31 17:12:21 -04:00
Kyep 6c960eeaf3 Adds Mil Alt Escape Shuttle (Troop Transport) 2017-07-26 02:40:18 -07:00
Crazy LemonandGitHub 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 McCloudandGitHub 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
KasparoVy a6bb591b46 Converts Mob Colours to Hexadecimal
No front-end changes. This just means that mob colours now take up less columns in the database, incur less processing (reduced rgb() calls) and reduces the amount of code dedicated to them.
2017-07-22 19:59:58 -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 McCloudandGitHub 7626942fce Merge pull request #7724 from shazbot194/Honk
Adds in the Jolly Jug
2017-07-12 23:26:51 -04:00
Fox-McCloud 92a024f11b last thing 2017-07-12 07:22:58 -04:00
Fox-McCloud 1a9d5b0408 Improves the quality of life of Cluwnes 2017-07-12 06:16:17 -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
Fox-McCloud 17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
tigercat2000andGitHub 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
MarcellusPyeandFox McCloud 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
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 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
Aurorablade d360500a2e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-06-28 22:11:17 -04:00
Aurorablade 818f9a0f40 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-06-28 22:10:08 -04:00