Commit Graph

1338 Commits

Author SHA1 Message Date
TheDZD
f5c35a6486 Merge pull request #4357 from Fox-McCloud/chem-stuff-disease
A Few More Disease and Reagents
2016-05-06 18:12:18 -04:00
Fox-McCloud
52bc145c17 botany and more reagents 2016-05-06 03:43:31 -04:00
Fox-McCloud
38278e2f58 random drugs 2016-05-05 22:50:46 -04:00
TheDZD
b4e923fa5c Merge pull request #4353 from Fox-McCloud/food-tweak
Mushrooms No Longer Taste Nasty
2016-05-05 21:22:14 -04:00
Fox-McCloud
1facb7a397 love and hugs 2016-05-05 19:50:29 -04:00
Fox-McCloud
d8375f09f2 initro, why not 2016-05-05 07:13:25 -04:00
Fox-McCloud
45fc535203 A Few More Disease and Reagents 2016-05-05 00:46:04 -04:00
TheDZD
7d6986a650 Merge pull request #4346 from Fox-McCloud/overdose-rework
Overdose Rework and Food Poisoning
2016-05-04 20:52:37 -04:00
Fox-McCloud
08ec1db17e food poisoning 2016-05-04 19:58:44 -04:00
Fox-McCloud
d2388f98e2 Mushrooms No Longer Taste Nasty 2016-05-04 18:20:06 -04:00
Fox-McCloud
311141225a tweak 2016-05-04 18:08:33 -04:00
Fox-McCloud
9dca286988 tweaks and additions 2016-05-04 03:12:58 -04:00
Fox McCloud
c70c8d9c39 Merge pull request #4304 from Aurorablade/JustTraitorThings
Crazy Fethas Traitor Emporium of Horrors
2016-05-04 01:22:13 -04:00
Fox-McCloud
2bcda77cf7 oops 2016-05-03 20:31:37 -04:00
Fox-McCloud
b295e7809e Overdose Rework 2016-05-03 19:55:11 -04:00
TheDZD
5435084dc7 Merge pull request #4328 from Fox-McCloud/tesla-update
Tesla Update/Rebalance
2016-05-01 12:52:40 -04:00
Tastyfish
8cd8ebffe3 Adds missing crushed cans, make cans that are technically bottles smash. 2016-04-30 20:12:48 -04:00
Fox-McCloud
8322aa9338 Tesla Update/Rebalance 2016-04-30 06:44:01 -04:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
Isaac Erwin
42c48eec77 Fixes the spacing on the dispensable reagents for the chem, booze, and soda dispensers
Now's a better time than ever
2016-04-28 09:08:02 -04:00
Isaac Erwin
013d334de0 Booze dispensers can now dispense synthanol 2016-04-27 19:40:53 -04:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
TheDZD
ddc459d92a Merge pull request #4189 from Fox-McCloud/xenobio-additions
Xenobio Addition
2016-04-26 20:23:49 -04:00
Fox-McCloud
d5fb23d4d7 no fun crew has arrived 2016-04-26 20:12:31 -04:00
FalseIncarnate
68bcfc5d0c Removes egg reagent from some foods
Simply put, this removes the egg reagent from the following
chef-produced food items:
- Bread
- Apple Tart
- Sugar Cookie
- Fish Fingers
- Nougat

Balance-wise, this really does very little (except make it so bread
doesn't make you fart), and should generally impact just about nothing
short of feeding people grilled cheese sandwiches to cause them to fart
on a bible.

At the same time, this introduces a couple spawn(1) into the New() code
for food items that are meant to clear certain reagents when made (like
removing sugar from some candies or egg from bread), to make it so they
actually remove the reagent.
- Since this was getting called before the reagents of the ingredients
are passed into the food through the cooking process, you'd end up with
sugar in your rainbow cotton candy when it wasn't meant to be there.
2016-04-23 16:29:44 -04:00
TheDZD
5df0a9afe4 Merge pull request #4221 from tigercat2000/tgalerts
-tg- screen alerts
2016-04-19 19:13:31 -04:00
TheDZD
66d44ddad4 Merge pull request #4207 from Fox-McCloud/syringe-qol
Syringe Injection QoL
2016-04-17 10:21:41 -04:00
Tigercat2000
aa3b7ac678 -tg- screen alerts
A lot has changed.

Major points:
 - All mobs now use the -tg- thrown alerts system. This is a system where
   a maximum of 5 "alerts" (which take the apperance of HUD icons like the
   inventory and modular action buttons) on their HUD.
 - Alerts are defined as a subtype of /obj/screen/alert.
   - Alerts are "thrown", or activated on the mob with the proc
     `mob.throw_alert("alert_id", /obj/screen/alert/path, severity
     (optional), new_master (optional, overlays the referenced "obj" on the
     button))`
   - Alerts are cleared by calling `mob.clear_alert("alert_id")` or by the
     /obj/screen/alert containing a `timeout` setting, which will
     automatically clear itself after that period of deciseconds.
   - Alerts may have functionality beyond appearance: Mousing over them
     will use the WireWraith tooltip system to generate a themed tooltip,
     and clicking them may have a function defined on the
     /obj/screen/alert object.
   - Shift-clicking an alert will give you it's name and status, in case
     the tooltips fail to work.

 - Hunger/Oxygen/Toxin/Nitrogen/Pressure/Etc warnings are now handled via
   the -tg- thrown alerts system.
   - Failing to breathe anything will display as an "No O2" warning.
   - Species breathing has been refactored to accomodate this. Vox are
     able to breathe the station air without instantly dying, but will be
     poisoned every time they breathe by the oxygen in the air. Any
     species with a unique gas breathing type will also display the
     correct "Choking (no X gas)" instead of just "oxygen". (Unless they
     have not breathed anything in, it's a quirk.)
   - Robot cell/temperature alerts also use this.
   - Aliens, though not harmed by toxins, will have an alert if they
     breathe in toxins, notifying them that "You'll be toast if this
     lights up."

 - More alerts have been added
   - Buckling
     - Activated on: Being buckled to an object.
     - Cleared on: Being unbuckled.
     - Click functionality: Calls resist(); Will unbuckle from chair
       instantly if unrestrained, otherwise, there is a delay period.
   - Hand/Leg cuffs
     - Activated on: Being handcuffed.
     - Cleared on: Being unhandcuffed.
     - Click functionality: Calls resist(); Will attempt to either get out
       of the handcuffs, or, if you are a xenomorph or hulk, break the
       handcuffs in 5 seconds.
   - Blind/High
     - Activated on: Becoming blinded/becoming high on LSD.
     - Cleared on: Becoming unblinded/the high wearing off.
     - Click functionality: None.
   - Asleep
     - Activated on: Life() tick detecting sleeping.
     - Deactivated on: Sleeping being 0 or less.
     - Click functionality: None.
   - Weightless
     - Activated on: Losing gravity.
     - Deactivated on: Moving back into an area with gravity.
     - Click functionality: None.
   - On Fire
     - Activated on: Catching fire.
     - Deactivated on: Being extinguished.
     - Click functionality: Calls resist(); Causes you to stop, drop, and
       roll, which will reduce firestacks and possibly extinguish you.
   - Law update (BORG ONLY)
     - Activated on: Laws being changed.
     - Deactivated on: Timer, 300 deciseconds.
     - Click functionality: None.
   - Hacked (BORG ONLY)
     - Activated on: Being emagged/given malf tools by the malf AI.
     - Deactivated on: Emagged status being removed.
     - Click functionality: None.
   - Locked (BORG ONLY)
     - Activated on: Lockdown being set (by emag law rewriting/robotics
       console/wire being destroyed)
     - Deactivated on: Movement being unlocked.
     - Click functionality: None.
   - Notify Cloning (GHOST ONLY)
     - Activated on: A human's body being placed in a DNA scanner.
     - Deactivated on: Timer, 300 deciseconds.
     - Click functionality: Reenters body.
   - Notify Jump (MULTIPURPOSE) (GHOST ONLY)
     - Activated on: Any sort of chance to become a mob (ie, golem rune).
     - Deactivated on: Timer, 300 deciseconds.
     - Click functionality: Varies.
2016-04-16 14:27:03 -07:00
TheDZD
42602d952f Merge pull request #4199 from Fox-McCloud/drinking-glass-sprites
Drinking Glass Sprites In-Hand
2016-04-15 22:06:31 -04:00
Fox McCloud
925bb2d9e2 Merge pull request #4203 from FlattestGuitar/shotglass
Adds shot glasses
2016-04-15 20:17:23 -04:00
Fox-McCloud
3f1e86e8e7 Syringe Injection QoL 2016-04-14 23:32:12 -04:00
Fox McCloud
0a5972b9ba Merge pull request #4116 from TheDZD/NOTTHEBEES
It's the Bees!
2016-04-14 21:27:01 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Mieszko Jędrzejczak
63470e0c71 I'm bad at inventive descriptions 2016-04-14 21:27:59 +02:00
Mieszko Jędrzejczak
7888adf6c5 Better desc ;) 2016-04-14 21:12:38 +02:00
Mieszko Jędrzejczak
6b72a889e6 Shot glasses 2016-04-14 20:53:47 +02:00
Fox-McCloud
3e68373831 Drinking Glass Sprites In-Hand 2016-04-14 05:08:04 -04:00
Fox-McCloud
4e04570a12 Remove Dropper Copy-Paste 2016-04-14 04:27:16 -04:00
Fox-McCloud
81ed1467d7 Xenobio Additions 2016-04-13 01:50:11 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
Fox McCloud
62b57d4cbf Merge pull request #4155 from Tastyfish/bruh
Makes cans crushable by humans and janiborgs
2016-04-11 18:44:17 -04:00
Tastyfish
ccbe2ca904 Makes cans crushable by humans and janiborgs 2016-04-10 17:20:09 -04:00
FalseIncarnate
397d71a3af Vendor Changes
Re-upload without the smoking pipe stuff.
2016-04-10 00:07:37 -04:00
FalseIncarnate
990c83c6bb Revert "Vendor and Pipe Changes"
This reverts commit d21168fb38.
2016-04-09 23:38:36 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
FalseIncarnate
d21168fb38 Vendor and Pipe Changes
Using a screwdriver on a vendor circuitboard now provides a nice list of machines to select from, rather than relying
on RNG to select them.

Vendor circuitboards have been moved from the Circuit imprinter to the Autolathe, and have had their costs tweaked accordingly
- Was 1000 glass and 20 sacid, now 750 glass and 250 metal
- This was because cargo is meant to be responsible for vending machines, and you had to get the supply containers from cargo ANYWAYS just to build a new one

Pipes, cigarettes, and joints can no longer be lit with a burnt match

Pipes and corncob pipes no longer can be refilled infinitely at whim
- A new item "pipe tobacco tin" has been added to the cigarette vendors, which can be used on an empty pipe to refill it 5 times before being consumed.
- Tobacco, Space Tobacco, Ambrosia Vulgaris, and Ambrosia Deus can be put directly into an empty pipe to fill it with that as an alternative

Pipes (the ones from the merch store computer) have had their volume reduced to 100, from 200 (that's still a lot of nicotine)

Corncob Pipes no longer come pre-filled, as that made no sense (normal pipes still come pre-filled, because you paid good money for that)
- They have also had their smoketime reduced to 400, from 800, so they don't last longer than purchased pipes
2016-04-08 02:51:04 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
2016-04-05 15:54:48 -07:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00