Commit Graph

2783 Commits

Author SHA1 Message Date
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
Aronai Sieyes
da6c649e50 VS: Universal technomancer cores 2020-04-13 22:35:13 -04:00
Aronai Sieyes
4cfea4302d Technomancer mark sprite 2020-04-13 22:35:13 -04:00
Leshana
262faa38e4 Replace global all_areas list with world.
It ends up having similar performance, so might as well not bother with all_areas.
2020-04-12 18:04:54 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Leshana
a794fecea0 Move gameticker to subsystem folder before editing to track history thru rename. 2020-04-10 11:37:46 -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
Aronai Sieyes
d948096587 Adjust two things that loop forever 2020-04-05 22:17:42 -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
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -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
8a33afaff6 VChat: Redone chat output done in Vue.js 2020-03-27 17:08:14 -04:00
Aronai Sieyes
381ef78365 Fix the doom asteroid waves 2020-03-26 23:27:40 -04:00
Atermonera
4384ca1727 Xenoarch Expansion 2020-03-24 21:43:27 -04:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Atermonera
d397c2c1fe Merge pull request #6840 from Neerti/qol_notification_sounds
QoL: Various Notifications
2020-03-20 15:09:47 -04:00
Leshana
f2a582569b Ports overmap events from Baystation12
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
2020-03-19 20:29:43 -04:00
ShadowLarkens
2e23dcdb49 Speed up mapload significantly
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2020-03-19 00:29:24 -04:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Razgriz
c66e2756b8 Add files via upload 2020-03-15 23:39:57 -07:00
ZekeSulastin
84f161a6f2 Fixes pregame loop with no readied players (#6814)
When the config option for pregame time was added in #6795, the
pregame_timeleft setting was moved out of the do while !setup loop.
If the game does not set up, it would keep decrementing the counter
into the negatives since it was never reset.
2020-03-11 01:36:01 -04:00
Aronai Sieyes
72f239b2ac Makes pregame time a config setting
Boo hardcoded values
2020-03-08 01:05:28 -04:00
Aronai Sieyes
f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -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
Nadyr
8fd3b260da Merge pull request #218 from Shadowfire117/Casinoport
Casino port!
2020-02-17 22:59:14 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Shadowfire
e141872c31 Casino port
This is first phase of casino port where I have made my casino spaceship compatible with new chomp codebase. There isnt a connecting port at station yet due to changes being made to main map, but with second phase of casino port there should be one for casino shuttle to move back and forth to transfer visitors.

Non-casino changes
Port of:
purple assistant cap, wah!
wiggler hat, dont know if the sprite works fully yet.
The monocoole, every self respecting technomancer needs this! Also need this for casino rewards.
Snaps, can recommend for lunch, I prefer the licorice flavoured ones!
Space cleaner dispenser, yep any janitors dream, so far its only on casino spaceship.
Ported old modular sofa for station usage, is already on casino, future plans could involve making the modular sofa that can be built from steel be a little more pretty and made from wood as well and also get another overlay/color when added cloth for cushion.

also deleting a .txt file that I didnt get to delete before someone really wanted me to upload wip files so they could work off them, sorry about that but its fixed now!
deleted alienwhitelist and custom_items.txt since github doesnt seem to have those blacklisted

casino port:
Ported the map with the golden goose spacecasino
ported the deluxe edition bar and kitchen gear! Say hello to the good old deluxe dispenser, deluxe food vendor and deluxe drink vendor, perhaps one day they will be constructible by crew!
ported the casino stripper pole, casino roulette, slotmachine, poker/blackjack table, ported the casino wheel of fortune
casino wallet~
casino jukebox! And re implemented the system so the casino songs no longer are on the normal jukebox, sorry folks, hope you didnt like them too much :c
casino visitor and staff manual, might need a bit of revision depending on what event managers wants
Casino chips, gotta gamble with something!
fixed runtime errors from deluxe dispenser trying to add cartridges with reagents that have been renamed on new chomp

Be aware, there will be more casino changes in near future along with some other non-casino changes, including porting of pint metamorphic glass.
2020-02-08 22:21:59 +01:00
Shadowfire
57464baadc port 0.9.9.9
just uploading so others can see work, still not ready for commitment
2020-02-08 01:11:36 +01: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
TheFurryFeline
dc0c513086 Changeling Item Name/Desc Fixy (#6624)
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
2020-01-16 02:56:14 -05:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Razgriz
178b4e66dd Add files via upload 2019-12-25 04:17:12 -07:00
Razgriz
90d4deb4d8 Add files via upload 2019-12-25 04:16:35 -07:00
Razgriz
4bcacc2602 Add files via upload 2019-12-25 04:15:43 -07:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Anewbe
12d5118ecc Merge pull request #6550 from listerla/grammar-time
Fixes two typos (rengeration and Extranneous)
2019-11-29 19:49:14 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Atermonera
1b21bb3d15 Merge pull request #6497 from parasitoide/master
Compatable -> Compatible
2019-10-27 16:21:16 -04:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3
9e88f55480 Merge remote-tracking branch 'upstream/release' 2019-09-16 14:57:39 +01:00