Commit Graph

2262 Commits

Author SHA1 Message Date
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
Repede
e44e346352 Release Update
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
2020-04-16 21:07:33 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede
6cdee7f423 Merge branch 'master' into kk-boozetraits 2020-04-10 16:59:33 -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
Repede
7f1a6d6cc7 Fuck this shit
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
2020-04-04 14:37:55 -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
izac112
55e46bdd83 Tricord OD = 120 2020-03-29 04:51:07 +02: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
Killian
f0958788af Merge branch 'kk-boozetraits' of https://github.com/KillianKirilenko/YWPolarisVore into kk-traits 2020-03-12 20:18:19 +00:00
Killian
75c3b74dc3 split chem_strength 2020-03-12 20:18:14 +00:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802)
* Adds more machine button sounds

* chang
2020-03-11 20:32:06 -04:00
Killian
0a94573a8c Update code/modules/reagents/Chemistry-Reagents.dm
Co-Authored-By: Izac Joof Forsgren <izac10@live.com>
2020-03-11 19:12:42 +00:00
Killian
7b79762980 setup for chemical traits 2020-03-11 13:35:57 +00: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
izac112
4c99fe6d1f might as well 2020-03-09 21:22:56 +01:00
Shadowfire117
f5999569a9 Merge branch 'master' into casinophase2 2020-03-09 15:39:53 +01:00
Shadowfire
f6daac300f fixy fix
Okay, fixed a lot of issues and reacted to the comments to parts of commit, hopefully we will get a nice pretty travis report this time
2020-03-09 15:31:04 +01:00
Shadowfire117
1beac90488 fixes
fixed some runtime errors with apparently lack of fixes I made earlier that I needed to redo.
changed some reagent containers which used the old New() proc instead of intialize
added gelatin and macha latte to dispenser and cartridges, might still have runtime and compile errors, but chompstation2 has the reagents implemented so wont cause issues.
2020-03-09 13:23:35 +01:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Aronai Sieyes
545a6cc447 Fix building med stands 2020-03-01 19:13:40 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
2020-03-01 12:35:52 -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
Killian
7d8f4e93a4 CHEERS! 2020-02-27 10:07:44 +00: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
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Shadowfire117
1ed5de2ec7 Second part of reagent porting
ported all chems of use, even the ones not produced by plants yet (they will be ported)
moved the metaglass sprite entries from metaglass to a new metaglass_ch to easy maintenance, the alt sprite code for metaglass still in original
Ported the drinks and plan on making in the future:
Bookwyrm not be straight up soporific and be something to drink without constantly going to sleep
Make high power stun without using obnoxious newbie solution I came up with a long time ago
Make the flapper and other blood drinks actually give nutrient to blood drinkers
Make Oilslide somehow be broken down and fuel synths

Ported the soy bean mutant chems and their recipes along with the recipe for blood clotting
ported all the fruit tea types, and made macha latte have large teacup metaglass sprite
ported the medical chems: Hannoa and Bullvalene
Ported Serazine made from a lavender mutant (not ported yet) and Alizine made from it acting as a tier 2 brute med.
2020-02-22 16:46:54 +01:00