Commit Graph

1949 Commits

Author SHA1 Message Date
Aronai Sieyes
31d69d016d Fix an exploit 2020-05-12 14:21:10 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Novacat
c70af70266 Merge pull request #7463 from Novacat/nova-ert
Overhauls First Aid Kits
2020-04-29 18:44:43 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Unknown
1048a969d4 Admin discussion changes 2020-04-29 15:23:01 -04:00
Unknown
31fbcefac9 Additional tweaks 2020-04-27 00:52:08 -04:00
Unknown
afe4c7498f Tweaks 2020-04-26 17:44:33 -04:00
Unknown
63e368cc93 Last Second Changes 2020-04-26 13:39:45 -04:00
Unknown
a6deb3078d Overhauls First Aid Kits
- Refactors First aid kits to be mostly autoinjector and pill based. No syringes, just autoinjectors and pills. Health analyzers are also removed.
Regular First Aid Kit: 3x Gauze, 2x Ointment, 1x Paracetamol pill bottle, 1x Inaprovaline pill bottle
Toxin First Aid Kit: 1x Dylovene Pill Bottle, 6x Dylovene Autoinjectors
Burn First Aid Kit: 1x Kelotane pill bottle, 6x Dermaline autoinjectors.
Oxy First Aid Kit: 5x Dexalin Plus autoinjectors, 1x Iron pill bottle, 1x Dexalin Pill Bottle
Adv First Aid Kit: Replaces Autoinjector with Assorted Pill bottle (3 Inaprov, 3 Dylovene, 2 Iron, 2 Tramadol, 3 Hyronalin, 1 Spaceacillin pills)
- Buffs default pill bottle contents. This narrows the effectiveness between autogenerated pills and pill bottles, and those brewed up by players.
- Splits Miner autoinjector into four seperate autoinjectors, one for each damage type. Reduces the price in the mining/exploration vendors.
- Tweaks Pill contents for a bit better consistency. Biggest change is that dexalin pills are 7.5u each.
- Changes Vermicetol chemical color to something more reddish.
- Overhauls Internals closet, removed O2 kits from them, adds more emergency spacesuits.
- Removes Organ Kits, Combat First Aid Kits now have a pill bottle with assorted organ repair pills.
- Surgical kits now have a regular health analyzer, and can hold health analyzers.
2020-04-26 13:38:28 -04:00
Leshana
763753648b Implements "static" area machinery power usage
- Instead of using auto_use_power to re-tally up machinery's power usage every cycle, track the steady "static" load separately from the transient "oneoff" usage.  Machines then only need to inform the area when they use oneoff power or *change* their steady usage.
- Remove auto_use_power and stop SSmachines from calling it.
- Add vars to track "static" usage for each of the three power channels to /area
- Rename the existing three vars to "oneoff" so its clear what they mean (and to catch people accidentally updating them directly)
- Update area power procs and APCs to use the new variables.
- Rename /area/proc/use_power() to use_power_oneoff() to make it clear what it is doing.
- Deprecate /obj/machinery/use_power() in favor of use_power_oneoff() but don't delete yet.  Can transition gradually.
- Add logic to the update_power procs on machines to calculate the deltas and update static area power whenever their usage changes.
- Add logic to machines to update area power when they are created, destroyed, or move.
- Moved /obj/machinery procs related to area power usage into machinery_power.dm to make them easier to find.
- Added or updated comments in several places to explain what is going on and how to use it.
2020-04-23 19:04:34 -04:00
Aronai Sieyes
534d4657d2 Make it behave the same as water in regards to xenobio 2020-04-20 18:05:51 -04:00
Aronai Sieyes
a2e6467936 FOAAAAAAAM 2020-04-20 17:16:25 -04:00
Aronai Sieyes
7a43642cbe New tank sprites and foam tank 2020-04-20 17:16:11 -04:00
Unknown
acbb3f3835 Oh I forgot to fix up the dispenser too 2020-04-19 16:52:54 -04:00
Atermonera
def2600bc0 Ingested ethylredox removes ingested alcohol (#6973) 2020-04-10 01:22:33 -04:00
Novacat
1d39b45870 Merge pull request #7116 from Heroman3003/slimedjust
Re-enables Slime Vore reaction, adjusts blocked lists for slimespawn reactions
2020-04-08 15:16:04 -04:00
Atermonera
ba2f4c76dc QoL: Small Medical Things 2020-04-05 03:03:06 -04:00
Heroman
2a2c31e54c Applies suggested changes 2020-04-03 14:10:19 +10:00
Heroman
f3466490d9 Re-enables Slime Vore reaction, adjusts blocked lists for Slime Vore and Slime Resources 2020-04-03 12:10:47 +10:00
Aronai Sieyes
a2bf4c602a Remove watercooler shields until Joan does icons 2020-04-02 11:23:52 -04:00
Unknown
dca2e93209 VS: Conflict Resolution + VS Changes
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
2020-03-31 13:56:38 -04:00
Leshana
adec04c010 Fix Runtime in reagent_containers.dm,112: undefined proc or verb /mob/living/bot/farmbot/check mouth coverage(). 2020-03-30 17:39:34 -04:00
Novacat
a765098a46 Merge pull request #6989 from VOREStation/upstream-merge-6892
[MIRROR] Distillery tweaks
2020-03-25 19:22:23 -04:00
Atermonera
baf867e93d Besrserkjuice doesn't spam chat (#6893) 2020-03-25 16:37:53 -04:00
Atermonera
6da6c7b1a5 Distillery tweaks (#6892)
* Basic distillery uses logistic temp change
Basic distillery pings when at temp
Industrial distillery repsects gas laws

* Expands examine text to be informative
Adds verbs to distillery

* Tweaks distillery costs
2020-03-25 16:36:26 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Unknown
db87175163 Earlyport Fixes 2020-03-20 13:50:44 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802)
* Adds more machine button sounds

* chang
2020-03-11 20:32:06 -04:00
Atermonera
d39b10b144 Merge pull request #6803 from Schnayy/CookingUpdate1
Cooking adjustments
2020-03-10 18:41:02 -04:00
Novacat
53b19470ce Update Chemistry-Reagents-Medicine.dm 2020-03-10 10:02:10 -04:00
Atermonera
7d522fe449 Fixed menthol cigarette runtime 2020-03-10 03:41:06 -04:00
Aronai Sieyes
545a6cc447 Fix building med stands 2020-03-01 19:13:40 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
Novacat
7031f896b9 Merge pull request #6606 from Heroman3003/biochem
Adds biochemical dispenser to medical's chemistry
2020-02-25 10:50:00 -05:00
Atermonera
c1fe64ba6a Merge pull request #6717 from LeighKnapenberger/master
Fixes Mint Apple Sparkle having a recipe, but no drink
2020-02-24 16:00:57 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Heroman
a1081d8012 Adds biochemical dispenser to medical's chemistry 2020-02-19 16:07:59 +10:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Novacat
5cac43ef0e Merge pull request #6480 from VOREStation/upstream-merge-6628
[MIRROR] Adds a mega cooking recipe
2020-01-21 01:26:48 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
5954adfe46 Merge pull request #6622 from Mechoid/WaterResistanceExists
Water resistance exists
2020-01-20 22:51:52 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Atermonera
7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
Can now (de)construct chem masters
2020-01-15 23:16:19 -05:00
drexample
5e01ad45a5 coding standards are my passion 2020-01-11 06:59:33 +03:00