Commit Graph

2142 Commits

Author SHA1 Message Date
Killian
24b507ad9c scatter speedloader & box printing 2020-05-05 16:17:28 +01:00
Killian
8240a97400 Merge branch 'master' into kk-miscstuff 2020-05-04 14:20:02 +01:00
SplinterGP
b0a76b628f Makes breacher chassis order the NT cheap knockoff instead 2020-05-03 18:02:49 -03:00
SplinterGP
78f4a2fd3f Autolathe patch, fixes teleporter stuff making it buildable 2020-04-30 20:08:06 -03:00
SplinterGP
c64a8b5072 Merge branch 'master' into holdelta 2020-04-26 00:05:58 -03:00
spaghettiweaver
aa87d150bd Merge branch 'master' into pianocargo 2020-04-23 00:42:09 -05:00
spaghettiweaver
f87c9e7b7e Adds purchaseable Piano crates to cargo
Costs 150 cargo points, to deliver a largecrate infamous for their ability to make their contents lighter and ship better. When pried open the crate produces either a minimoog or space piano.
2020-04-23 00:28:03 -05:00
SplinterGP
a1d533eeca Merge branch 'master' into holdelta 2020-04-22 23:25:36 -03:00
Killian
bf0b12f8a5 Sec Voidsuit Sync 2020-04-23 02:11:28 +01:00
SplinterGP
ca09ee6305 Autolathe fixes 2020-04-22 02:09:01 -03:00
Killian
04a0e66302 Merge branch 'master' into kk-miscstuff 2020-04-19 18:54:53 +01:00
SplinterGP
8d11d31b39 fixes more ID issues 2020-04-19 00:21:37 -03:00
SplinterGP
107c4bcb81 fixes ID issue 2020-04-19 00:20:38 -03:00
SplinterGP
d577c0ee11 more hotfixes 2020-04-18 19:26:18 -03:00
SplinterGP
4d5f1282b7 adds missing top mounted SMG magazines 2020-04-18 18:50:01 -03:00
SplinterGP
a392107d69 fixes wrong pathes into designs 2020-04-18 18:45:46 -03:00
SplinterGP
70987889c0 adds missing designs for autolathe 2020-04-18 18:42:59 -03:00
Killian
35dedb85e8 Merge branch 'master' into kk-miscstuff 2020-04-17 19:56:51 +01:00
Repede
fa632c811d Merge branch 'master' into voreupdate 2020-04-17 00:13:39 -04:00
Killian
b28ff5ceaa Merge branch 'master' into kk-miscstuff 2020-04-17 04:34:45 +01: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
SplinterGP
7d633c306b removes debug 2020-04-16 00:30:12 -03:00
SplinterGP
8228c60f4d Adds new autolathe interface for testing before sending to polaris/virgo 2020-04-16 00:16:52 -03:00
Aronai Sieyes
074116fa7c Merge pull request #7212 from Novacat/nova-pathfinder
Gun Refactors and Changes
2020-04-13 09:45:37 -04: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
Aronai Sieyes
f8d920fd02 Allow 'offmap spawn' jobs to be isolated from station employees 2020-04-11 12:03:10 -04:00
Aronai Sieyes
98dd3707c1 Refactor consoles to operate on logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Repede
517d74928b Merge branch 'master' into kk-miscstuff 2020-04-10 16:59:07 -04:00
Aronai Sieyes
ce8bda7cd7 Merge pull request #7118 from VOREStation/vplk-shields
Ports Baystation Advanced Shield Generators
2020-04-07 23:53:12 -04:00
Leshana
d66f508541 Fixes for vorestation merge of "Rewrites the Rewritten Event System"
- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
2020-04-06 17:31:26 -04:00
Leshana
08c2d2db6e Remove non-global references to SSgameMaster and SSevent_ticker
- Best practice to avoid holding onto references to the subsystem instances aside from the global variables. (In case of restart/recover etc).
- The reference to GM was entirely unused by any event or meta-event.  /datum/game_master would work fine using the global refs.
2020-04-06 17:28:11 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix
Rewrites the Rewritten Event System
2020-04-06 16:23:39 -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
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
Repede
73ec83c76f Merge branch 'master' into kk-miscstuff 2020-03-28 00:15:57 -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
SplinterGP
07e4d28fb7 Balances and finishes scattershot stuff 2020-03-24 20:45:39 -03:00
Novacat
94f5eda84c Merge pull request #6967 from VOREStation/upstream-merge-6881
[MIRROR] Add mob/living stat setter and observer
2020-03-23 23:25:02 -04:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Atermonera
1873a3a870 Merge pull request #6880 from Greenjoe12345/teshariprosthetics
Teshari prosthetics
2020-03-23 22:38:13 -04:00
Aronai Sieyes
4aaff0704e Merge pull request #6925 from ShadowLarkens/vore_cleanup_less_cursed_maybe
Cleanup vore code
2020-03-21 00:52:46 -04:00
Atermonera
d397c2c1fe Merge pull request #6840 from Neerti/qol_notification_sounds
QoL: Various Notifications
2020-03-20 15:09:47 -04:00
ShadowLarkens
d5d5385b76 Cleanup vore code 2020-03-19 21:17:24 -07:00
Killian
8b9f5e949a security pilot basics 2020-03-17 15:11:28 +00:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Killian
838812d50c Merge branch 'master' into kk-miscstuff 2020-03-16 18:47:22 +00:00
Killian
57bdededcc loyalty implant reimplementation 2020-03-16 18:22:49 +00:00
Leshana
4c7ad1c24e Optimize wire hacking QoL (#6835)
Keeps the same "bold if changed" functionality added in recent QoL improvements, but replaces the one-datum-instance per hint per device with a two number vars per device.
2020-03-16 05:27:57 -04:00
Killian
187c991835 add blueshield special access 2020-03-14 20:35:42 +00:00