Commit Graph

1348 Commits

Author SHA1 Message Date
tigercat2000 484af3afc4 Merge pull request #7827 from FalseIncarnate/plumbing
Plumbing Update
2017-09-12 20:20:23 -07:00
FalseIncarnate a60a4935ac one more visiblemessage 2017-09-12 23:14:07 -04:00
FalseIncarnate fca1a3f067 visible message and styling tweaks 2017-09-12 23:06:01 -04:00
FalseIncarnate 736c549f86 Shower tweak
Showers no longer will apply water whenever check_heat is called, and
will now attempt to wash you while you remain under them during their
process() call (33% chance per process per mob)
2017-09-12 21:00:19 -04:00
Birdtalon d78c1a3fb9 wall-locker bugfix 2017-08-29 15:46:44 +01:00
tigercat2000 c281ee7b77 Revert "Buffs the HoP Door remote" 2017-08-28 21:35:18 -07:00
Fox McCloud 71cfaa2325 Merge pull request #7983 from Birdtalon/wall-lockers
Control click to open wall lockers.
2017-08-28 18:24:08 -04:00
Fox McCloud 70cd062699 Merge pull request #7999 from Birdtalon/door-remote
Buffs the HoP Door remote
2017-08-28 18:23:55 -04:00
Fox-McCloud 16bff9cc86 longer musics 2017-08-27 19:49:40 -04:00
Birdtalon d7a6833268 alters door remotes 2017-08-22 16:12:12 +01:00
FalseIncarnate 7a19c93862 More tense/spans cleanup 2017-08-19 18:37:09 -04:00
FalseIncarnate 76b8d3dcae two more cleanups
missed these in the last cleanup commit
2017-08-19 01:42:44 -04:00
FalseIncarnate 1aecac849b Code cleanup, spans, tenses
Cleans up code for toilets and sinks attackby wrench interactions to be
generally better and also include cancel options. Rotation and movement
is now based on a var rather than the istype checks for sinks

Fixes spans and tenses for visible messages

Also changed a qdel to QDELL_NULL
2017-08-19 01:30:15 -04:00
Fox-McCloud 881c0e9d92 Merge remote-tracking branch 'upstream/master' into musics 2017-08-16 19:12:46 -04:00
tigercat2000 d90229e2ad Merge pull request #7839 from taukausanake/buffs_duffs
Buffs duffs
2017-08-14 10:57:06 -07:00
Birdtalon 7aa7634d4a fixes crates 2017-08-14 18:05:04 +01:00
Birdtalon d22f02af01 shortcut to open wall lockers 2017-08-14 10:32:15 +01:00
Fox-McCloud ba9f53ba21 small performance tweak 2017-08-08 23:17:21 -04:00
taukausanake 3e86cb1a8c Merge branch 'Paradise-clean' into buffs_duffs 2017-08-06 22:07:10 -05:00
FalseIncarnate 67c42ea2c0 Buildable toilets, urinals, sinks, mirrors
Toilets, urinals, sinks, and mirrors are now buildable.

Mirrors are also able to be unfastened from walls, shattered mirrors
return a glass shard instead of a mirror item.
2017-08-06 21:29:42 -04:00
Fox McCloud 2dcae64f3a Merge pull request #7876 from Aurorablade/Clothes
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Sam 6e995515ff whoops 2017-08-04 06:20:58 +01:00
Fox-McCloud d7da6cb94c Adds a Bunch of Instruments 2017-08-02 03:19:03 -04:00
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 6bd0d17527 performance 2017-07-31 14:01:15 -04:00
Fox-McCloud c6465f5be7 yep, still need this 2017-07-29 20:41:38 -04:00
Fox-McCloud 968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Aurorablade 04d4244b90 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes 2017-07-26 00:07:24 -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
Crazylemon64 9c86d07252 Adds decorative telecomms machinery for map making 2017-07-23 21:08:10 -07:00
FalseIncarnate bb6ff349da Fixing offset/layer for north state sinks 2017-07-23 02:32:18 -04:00
FalseIncarnate e0837b1254 Showers
You can now detach showers with a welding tool

Cleaned up some code regarding shower mist
- Also made boiling shower water make mist faster, and freezing shower
water can disperse mist

Made a new proc for /atom/movable to handle transferring fingerprints
from one atom to another
2017-07-23 02:10:57 -04:00
Fox-McCloud 027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -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
FalseIncarnate 04ec014ea4 Plumbing Update
Sinks, Toilets, and Urinals can now be unanchored and moved with a
wrench.

Standard sinks and toilets can also be rotated when unanchored by
hitting them with a wrench again.
- Urinals and kitchen sinks cannot be rotated because they looked
horrible in other directional states.
- I removed the directional states from them because we don't use them
and MAN were they bad.

When re-anchoring a sink or urinal, it will automagically offset itself
to match its direction. This means sinks will appear against walls (or
at least the edge of the tile).

While unanchored, sinks cannot be used to wash hands or objects. Toilets
can still have things hidden in their cistern while unanchored, however.

At this time, showers cannot be moved and there is no way to obtain new
fixtures. I'll be adding that later in this PR.
2017-07-19 00:06:17 -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
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
Aurorablade fd1a3af3b6 clothes! 2017-07-07 22:44:20 -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
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 42cf53a30f Merge remote-tracking branch 'upstream/master' into instruments 2017-07-04 17:42:24 -04:00
Crazy Lemon b8d5d530b4 Merge pull request #7690 from Aurorablade/VeryImportentMedicalGear
Adds in an importent piece of medical gear
2017-07-04 11:08:56 -07:00
Fox-McCloud 0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -04:00
Aurorablade 97252cd2f8 MEdicalgear 2017-07-01 22:55:40 -04:00
Fox-McCloud bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Kluys 04b02435fb Bob ross painting
While trying to fix my github accidentally closed https://github.com/ParadiseSS13/Paradise/pull/7629 from the shell.

Redid the entire PR.
Changes remained the same
![Image of captains office](https://puu.sh/wuWt0/4ea9796196.png)

🆑 Kluys
Add: Bob ross painting in the captains office called "calming painting".

Also changes around the entertainment monitor and light switch to accomodate.

Fix: Clown painting was named "\improper mech painting"
/ 🆑
2017-06-29 21:28:04 +02:00
tigercat2000 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
Crazy Lemon a66a31ee83 Merge pull request #7589 from Vivalas/master
Fixes weird offset with beds when buckled.
2017-06-23 09:26:39 -07:00
Vivalas 84e3ce1b9a Integrates offset better 2017-06-20 17:30:42 -05:00