Commit Graph

168 Commits

Author SHA1 Message Date
Aronai Sieyes
be6f4e0da0 Add inducer designs, make protolathe take titanium 2020-04-23 15:57:33 -04:00
Aronai Sieyes
15fc474520 Portable generators, RTGs, void cores 2020-04-19 21:42:13 -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
Unknown
323d5f838b Gun Refactors and Changes
- The Protector is now a minature energy gun, it has 3 lethal, 6 standard stun, and no special stun shot anymore. It retains the alert level lock, there is a version without the lock.
- The energy net gun now gets 3 net shots, but loses its stun alternate fire. It also gets a new sprite from baystation.
- Refactors all Vorestation weapons in vore/fluffstuff to be in their appropriate directories.
- Removes all personalized custom weapons.
- KHI is no longer the manufacturer for the Protector, Net Gun, and AR Glasses. I wanted to make KHI a bit rarer, and their specialty mainly ultra high tech equipment.
- Refactors Expedition Phasers. No practical change, but now there are unlocked versions of all three phaser variants.
2020-04-11 19:39:49 -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
Leshana
e2bd546f61 Ports advanced shield generators from Baystation
- Creates new advanced shield generators, designed to replace old hull and bubble shield generators.
- Upgrades the floor mounted and handheld shield diffusers.
- Makes underfloor shield diffusers actually constructable.
- Handheld diffusers orderable via uplink.
- Removes supply packs and research datums  for the old generators, but leaves their code in place for maps that still use them.
- Integrates with the meteor and electrical storm events.
- Integrates with mob AI (they know how to attack it)
2020-04-03 00:56:15 -04:00
Leshana
f022647037 Adds point defense batteries to defend against meteors
- Creates a global meteors list to make it easier to find them.
- Adds point defense mainframe, batteries, projectiles, circuitboards, and R&D designs.
- Adds sound effects and icons for the new machines.
- Original code and sprites ported from Baystation.  Adtapted to our code, added icon states and QoL elements.
2020-04-01 21:30:30 -04:00
Aronai Sieyes
91d4e6897a Prosthetic Expansion: Advent of Species
Update robolimbs.dm
Update vorestation.dme
Update prosfab_designs.dm
Fix prosfab_designs.dm
2020-03-14 14:04:06 -04: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
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
2020-02-24 16:15:04 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
RadiantFlash7
9dd30878ac Update code/modules/research/designs/engineering.dm
Second comment tag

Co-Authored-By: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com>
2020-02-09 11:35:30 -05:00
RadiantFlash7
3ac593922c Update code/modules/research/designs/engineering.dm
Tagging

Co-Authored-By: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com>
2020-02-08 22:51:25 -05:00
RadiantFlash7
b5142f5077 RPD Changes
Map fixes and changes!
Adds RPD to science,
Removes RPD from locker, leaves one on table in atmosia.
Removes APC for cryogaia compound. should be able to make new buildings/rooms now.
2020-02-07 19:56:57 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
2020-01-31 18:23:50 +01:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Aaron
ff9ec4943b New Mech "Scarab"! Plus a bunch of mech fixes
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
2020-01-20 19:51:24 -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
Sharkmare
f568be89d9 The cake, Serg event. (#120)
Adds items for an event, Made by Shadowfire117 and Ketrai
2020-01-11 00:20:57 +01:00
DHA
b93f5a2fa4 ML3M and NFSW gun research removal
Removed from science research, but they are still in the code. This is to remove them from play. Reasons for removal are too complicated to state here.
2019-12-27 08:48:37 -08:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Anewbe
249a05e888 Merge pull request #6554 from Nalarac/Cellicon
Protolathe Power Cells Tweak
2019-11-29 19:49:48 -05:00
Hawk-v3
c7e41b1c24 Merge branch 'master' into master 2019-11-02 10:43:44 +00:00
RadiantFlash7
8cca4cb043 Comments out Stripper cell
...We do not need to give science the ability to instantly strip anyone, including ERT, Deathsquad, etc..

This was a bad idea all around.
2019-11-01 23:56:47 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Repede
22e602deb3 Merge branch 'master' into larger_bodybags 2019-10-17 20:09:00 -04:00
TrilbySpaceClone
77b13577a1 grave storge 2019-10-16 21:18:18 -04:00
Hawk_v3
8edc441c63 Renames for descriptiveness.
R&D now knows exactly what every device is.
2019-10-12 21:43:52 +01:00
Trilbyspaceclone
56dde59333 Update power_cells.dm 2019-10-09 11:52:26 -04:00
Trilbyspaceclone
f3b8e49fbd Update power_cells.dm 2019-10-09 11:47:29 -04:00
Trilbyspaceclone
adf9ff0cf1 corrects item paths
cells were already taken, my bad
2019-10-09 11:26:36 -04:00
Hawk-v3
9f3802b9a0 Revert "Adds in two new cells for sci to get!" 2019-10-09 16:14:07 +01:00
TrilbySpaceClone
c245955ead Suggestions 2019-10-05 22:20:05 -04:00
Trilbyspaceclone
5eae6a4200 Update power_cells.dm
Why did this complie locally?
2019-10-05 18:42:17 -04:00
TrilbySpaceClone
af68971451 maybe it just works
whom knows
2019-10-05 18:12:59 -04:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Heroman
3ea943f9ad Sorts vorestation-only rnd recipies 2019-09-26 18:41:54 +10:00
Novacat
794bf4c648 Update weapons.dm 2019-09-26 03:10:04 -04:00
Atermonera
0b31dcace5 Properly sorts all protolathe designs 2019-09-26 03:00:43 -04:00
Trilbyspaceclone
0a6dace356 Update medical.dm 2019-09-18 20:14:50 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Novacat
eced9eda28 Update circuits.dm 2019-08-08 16:30:08 -04:00
Andrew
9d93bea992 Allows Construction of Serenity in Robotics 2019-08-08 16:28:07 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Novacat
d5f0f35519 Merge pull request #5357 from Wickedtemp/master
Allows New Serenity Mech To Be Constructed
2019-07-17 17:35:41 -04:00
Atermonera
4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing
Adds more GPS variety
2019-07-01 20:47:22 -04:00
Andrew
586ad2906e Adds Material Scanner to Protolathe (#6235)
* Adds Material Scanner to Protolathe

Adds the optical material scanner to the protolathe (the ones miners get).
Costs 50 steel and 50 glass (same as all the other HUDs)
Required tech is 3 magnet and 3 engineering (same as on the HUD)

Also adjusts the meson design so it actually uses its parent code like the other HUDs

* Changes sorting string
2019-06-28 21:22:09 -04:00
Wickedtemp
82422d9a75 Update circuits.dm 2019-06-22 00:02:58 -05:00