Commit Graph

334 Commits

Author SHA1 Message Date
Citinited
988ed89710 Fixes some instances of disposals sending things to nullspace 2017-08-05 05:51:54 +01: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
426c39ef3f Icon Fixes 2017-06-30 03:21:12 -04:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Sam
c1cc319f62 Uses more intent defines 2017-06-03 18:29:50 +01:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
TullyBurnalot
c15a7c86a9 Fixes Disposal Bin Light 2017-05-14 14:42:56 +01:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Fox-McCloud
9a20311152 better QDEL_NULL 2017-04-04 00:35:42 -04:00
Fox-McCloud
fb02933f30 For qdel and Destroy Fixes 2017-04-03 19:06:20 -04:00
Fox-McCloud
9c159e63dd sleep in destroy 2017-04-01 08:22:32 -04:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Mars
3a5b87b00a Switching logic
Any value != 0 is true, and !0 becomes 1, so you were only able to set
the one direction to be forced, and not the other.
2017-03-21 19:18:29 +01:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
uraniummeltdown
9eb7eea1e9 removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA 2017-03-10 22:46:02 +04:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
Mark van Alphen
93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie
02c4cd26f4 Final fixes 2017-03-05 16:42:14 +01:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Markolie
bbaef077db Conveyor switch interaction 2017-02-21 18:21:50 +01:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Markolie
9a69922a86 Fix slicing disposal pipes not showing a progress bar 2017-02-18 15:58:38 +01:00
Markolie
5deafdb4e5 Fix Destroy() return, replace set_dir with setDir 2017-02-06 20:44:12 +01:00
Fox McCloud
c9b4a951ae Merge pull request #6178 from FalseIncarnate/NTPS
NTPS: Requests Console Based Shipping
2017-01-31 01:26:21 -05:00
FalseIncarnate
5dcb868cec NODROP and Destroy() considerations 2017-01-19 03:52:11 -05:00
Crazy Lemon
37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
FalseIncarnate
4e1e3a6107 Shipping Package tweaks
Shipping packages now have sealed and unsealed icons
- These are just minor edits of the idOld icon_state the shipping
package previously used.

Shipping packages now have their own proc to handle adjusting their
description, rather than being done manually by the request console that
creates them.
- The description also reflects if the package is unsealed (just in case
the icon didn't give it away

Empty unsealed shipping packages can be destroyed by activating them
in-hand.
- There is a confirmation to prevent accidental shredding of shipping
packages.
2017-01-16 01:18:06 -05:00
FalseIncarnate
811ccaa273 NTPS: Requests Console Based Shipping
Ever been stuck in your office and thought "Wow, I really could go for a
burger, but the kitchen doesn't deliver." or "I'm too lazy and/or scared
to go to science to ask for a new circuitboard in person."?

Introducing NTPS: NanoTrasen Priority Shipping! All requests consoles
have been upgraded with a brand new printer, capable of producing
pre-tagged, single-use, single-object shipping packages for crew use!
Chefs can send burgers to distant diners, or science can package up that
brand new circuitboard you've been harassing them for and send it
straight to you!

But what if you have a larger parcel you want to ship, but don't have
access to cargo's coveted destination tagger? Have no fear, simply slap
the empty shipping package onto the parcel to give tag it just like
cargo!

But wait, there's more! Use a pen on any sealed shipping package and you
can include the name of your intended recipient on the package! Now,
when a coworker steals their mail, at least they will know it!

This PR adds the ability for all requests console to print off Shipping
Packages that come pre-tagged for a destination of your choosing. Each
package can hold a single item of normal or smaller size (no storage
containers, so you can't stick a bag or box in them). Once filled,
simply activate the package in hand to either dump out the item (in case
you put the wrong thing in) or seal the box for shipping. A sealed box
can then be further addressed with a pen, and dropped into any disposal
bin to start the delivery process (assuming it's connected to the
standard loop). Unsealed boxes will be delivered to disposals by way of
the cargo mail room, so make sure you seal it or hope that cargo is kind
enough to seal and resend it for you! If you have a wrapped parcel
(wrapped with packaging paper), you can also affix an empty shipping
container to the parcel to tag it yourself with the destination of the
shipping package, just in case cargo accidentally sent that virus crate
to the wrong person!
2017-01-15 05:13:17 -05:00
Crazylemon64
3c50c2f6ba Makes conveyors easier to place with buildmode, adds vars to autogibbers
makes them kill stuff stupid fast
2017-01-11 02:07:20 -08:00
Crazylemon64
f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Fox McCloud
5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Crazylemon64
c0cd2c263f Switches reset_view to reset_perspective 2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c Polishes up the reset_view proc, which is basically
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Tigercat2000
b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -08:00
Aurorablade
c0f28fd0aa fix a ref id error 2016-11-09 00:51:54 -05:00
Markolie
9815f9e2c6 Pressure limit on disposal units 2016-10-22 20:51:49 +02:00
Fox McCloud
dfde050407 Merge pull request #5644 from GeneralChaos81/Conveyors
Port of TGs conveyors
2016-10-11 20:27:46 -04:00
GeneralChaos81
9112d5cf85 removed redundant setmove proc. Put directions back the the original setup, which was correct 2016-09-15 11:18:23 +10:00
GeneralChaos81
fb335d3a4f to_chat and I.forcemove changes. Noticed half (almost exactly) of the conveyors weren't synced to their levers, so put Spawn(5) back in. 2016-09-13 11:28:28 +10:00
GeneralChaos81
d9bd16a0db Diagonal pieces directions were not correct. 2016-09-12 11:47:54 +10:00
GeneralChaos81
94cddf84ae Multitool working, but the GUI for it doesn't refresh. 2016-09-12 10:41:48 +10:00
GeneralChaos81
9bae9f5c57 Multitool code in... not quite working. 2016-09-11 19:28:40 +10:00
GeneralChaos81
9636163127 Back to how it was before, when it was even working at all. 2016-09-10 16:52:20 +10:00
GeneralChaos81
df9ba20f23 Trying stuff to get conveyors to initialize with the map 2016-09-09 23:19:48 +10:00
GeneralChaos81
4af47209ae Removed all the commented sections after testing. 2016-09-09 17:53:11 +10:00
GeneralChaos81
010293bbf8 Port of TGs buildable conveyors. We can finally repair broken conveyors! 2016-09-09 16:35:08 +10:00