Commit Graph

878 Commits

Author SHA1 Message Date
Unknown
dd7cf8e56e Fixes Broken RIG in Crates 2020-06-07 16:42:16 -04:00
Atermonera
28e952806c Adds proc to replace default cells with high cap on machinery (#7241)
* Adds proc to replace default cells with high cap on machinery

* *grumbling*
2020-06-04 22:38:39 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Aronai Sieyes
21a640ebd3 Adds get_cell to drill heads so you can use an inducer on them 2020-06-02 20:56:55 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes
f4e981c80d Merge pull request #8031 from VOREStation/Arokha/drillcell2
Actually fix drill cells for real this time
2020-05-22 16:27:49 -04:00
KasparoVy
fd665ed938 Amend Nomenclature for Clarity & Consistency
Opted to leave the trait datum type and name for the sake of reference & mild humour.
2020-05-22 12:12:32 -04:00
Aronai Sieyes
448a210929 Actually fix drill cells for real this time 2020-05-22 09:57:46 -04:00
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
264a8340c1 Can map in cell'd mining drills using the /loaded subtype 2020-05-21 11:31:00 -04:00
Razgriz
fb98ba3471 Update mine_turfs.dm 2020-05-21 03:42:03 -07:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Razgriz
5e8aa0b124 Merge pull request #343 from Rykka-Stormheart/shep-dev-pawsteps!
Earlyport of Footstep sounds properly working!
2020-05-10 14:26:27 -07:00
Rykka
d01c717b9b Comments out upstream stuff, will be uncommented out during upstream merge 2020-05-09 18:39:27 -04:00
Rykka
160ac0f3d7 Earlyport of Footstep sounds properly working!
Removes the `New()` and `Initialize()` workarounds, fixes footstep sounds globally. All sounds and values have been tweaked carefully to match Chomper files, if there's any failures and/or issues, I will work to correct them. This is an EARLYPORT of https://github.com/VOREStation/VOREStation/pull/7737
2020-05-09 18:30:43 -04:00
Rykka
3d5bb56f8f Add footstep sounds to almost every single tile.
Shuttle tiles, default floors are still "regular".
Lava, sand, water, grass, beach, mining turfs all have sounds playing now for each footstep. <3

Massive credit to @Arokha for helping me figure out the floor system and sitting through getting it put together. <3 <3 <3
2020-05-09 17:40:14 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
Unknown
1df25602c3 Poncho for mining 2020-05-03 10:08:19 -04:00
Novacat
048d7ac1ee Update survey_vendor.dm 2020-05-01 14:26:18 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Atermonera
f4e155db8f Merge pull request #7051 from InterroLouis/master
Tweak to mining scanner
2020-04-30 23:17:19 -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
874baa1d2d Merge examine refactor for vorestation 2020-04-29 17:49:54 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Novacat
98574bf939 Merge branch 'master' into nova-ert 2020-04-29 14:29:09 -04:00
Aronai Sieyes
fb87fbe2d7 VS: Add UAV 2020-04-28 23:18:27 -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
KasparoVy
eed070851e Enabled the Smelting of Plastitanium
Seems like an oversight - can make titanium (smelting rutile), titanium glass & plastitanium glass but not plastitanium.
2020-04-21 21:42:35 -04:00
Aronai Sieyes
ace05634f5 Merge pull request #7354 from VOREStation/aro-tweaks
Smol Fixes
2020-04-20 19:39:47 -04:00
Aronai Sieyes
e9f7a40600 Add points for rutile ore 2020-04-20 13:56:06 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
Atermonera
0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Unknown
a5f62634be Adds additional safeties
Stops ships from being deployable on planet surfaces
2020-04-19 19:30:35 -04:00
Unknown
c322941953 Assault Dropship, NDV Daedalus, and more!
- Adds an adminbus archeotech military dropship
- Renames the cruiser to the NDV Daedalus
- Removes the Daedalus' Vault, replaces with a engine room consisting of four nuclear reactors. 800 kw safe output
- Replaces the hull material of the Daedalus with something destructable
- Thickens the frontal hull of the Daedalus
- Combines shelter_atoms.dm and shelter_atoms_vr.dm into shelter_atoms_vr.dm (Polaris never ported Shelter capsules from us)
- Moves shelters.dm to shelters_vr.dm
- Fixes scanner readout of the Escape Pod
2020-04-19 15:01:40 -04:00
Unknown
5d2186cafd Fixfix Travis 2020-04-17 09:27:31 -04:00
Unknown
d1e2412d76 Deployable Escape Pods
- Adds Surfluid Escape Pod Capsule
Adds one to the cruiser
Updates some contents
Adds Support for unique deployables
Removes redundant global vars
Better error message
Sets a var correctly
2020-04-17 09:17:46 -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
KasparoVy
b4d290b7c2 Increases the Potential of Ore Eater & Adds Adminbus
It can now be effectively granted to non-humans, who can now eat ore if they click it while NOT on help intent.
Additionally, you can now feed ore to mobs that can eat it.
2020-04-06 22:18:00 -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
KasparoVy
04378e159e Abstract Eating of Ore to Fix Unintentional Prompt
Using the verb with nothing in your hand brings up a prompt to select an object due to the argument in the verb.

This resolves the issue, instead just showing the "nothing in your hand" message as intended.
2020-04-03 23:14:42 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
KasparoVv
af2b83379a Add VS Edit
Arokha's recommendation

Co-Authored-By: Aronai Sieyes <arokha@arokha.com>
2020-04-02 03:31:43 +00:00
KasparoVy
bb756cbdc9 Adds a Rocky Diet
Taking the ore eater trait, you only gain nutrition from ore.
The amount varies, mainly based on the rarity/quality of what you're eating.

5 raw diamonds or verdantium will feed you well, while it'll take a handful of hematite or carbon to do the job. Better stick to the good stuff - it's in your best interest!
2020-04-01 21:52:27 -04:00