Commit Graph

167 Commits

Author SHA1 Message Date
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
RadiantFlash7
64e7b88c4a Adds airlocknotice
Adds airlock notice, and last minute map touchups to make it feel like a recently purchased and rennovated station.
2019-12-14 11:53:40 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
RadiantFlash7
ae3f109ae1 load order fix& typos.
Fixes minor typos and load order for the job outfits datums.
2019-12-09 18:56:10 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
RadiantFlash7
2348fed664 More fixes.
Fixes for the map.
Fixes turfs, cameras, access issues, and a few more things.
2019-12-08 18:32:45 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
TheFurryFeline
cc54005602 Fix Strange Rock Size (#6535)
* Fix Strange Rock Size

Title

* Create TheFurryFeline - Strange Rock Fixy.yml.txt

* Proper Changelog Filetype
2019-11-29 19:51:02 -05:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
2019-11-29 19:13:53 -05:00
RadiantFlash7
64afd0f3df Icepick, exploration polish, shuttle areas, etc
Adds ice pick sprites, Polishes Exploration vessel,
Adds some fluf in form of board.
Fixes all holodecks for main holodeck.
Adds trader shuttle LZ, and ERT shuttle LZ to cryogaia.
Adds Vox raider LZ's, and 1/4 of Syndi shuttle LZs.
Adds new yellow trailblazers.
Finishes up atmos and power in exploration wing.
2019-10-30 00:53:45 -04:00
Hawk_v3
29dd9facf0 Merge remote-tracking branch 'upstream/release' 2019-10-24 21:58:11 +01:00
Rykka
3e5d12e1c6 Fix proc so it works 2019-10-24 13:07:14 -06:00
Rykka
0c9a3e8c81 Merge branch 'master' into shep-dev-sound-overhaul 2019-10-16 01:53:06 -06:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Unknown
dade2aa80b Conflict Resolution 2019-10-06 13:12:11 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
Rykka
495cea4480 Updates this file so it works too! 2019-09-23 09:47:44 -06:00
Rykka
4cc5771aba Adds 3 grass footstep sounds, adds a small "ding" to the Xenoarch scan 2019-09-22 07:14:02 -06:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76 Early Polaris Ports
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Andrew
69ed422019 Adds Laser Tag Turrets Plus Changes (#6324)
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
2019-07-27 15:45:58 -04:00
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01:00
Atermonera
21e5e3e111 Xenoarcheaology Tweaks 2019-07-12 02:51:29 -04:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00
Hawk_v3
c7b05c05fb Merge remote-tracking branch 'upstream/master' 2019-06-11 02:34:25 +01:00
Neerti
4512cd7b18 Merge pull request #6200 from Heroman3003/xenoarch-fixes
Fixes some xenoarch bugs
2019-06-09 11:47:07 -04:00
Hawk_v3
d893b2dd24 Merge branch 'master' into map 2019-04-14 20:07:12 +01:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
RadiantFlash7
fd32189505 Major Map overhaul
Cargo finalized
Security rework #5 Done.
Maintence fleshed out,
...Security reword #6 started,
Escape hall added in progress,
added centcom z level for transit arrival/departure shuttles along with centcom.
Copied tether.dm files over to /yw map folder for proper custom map compiling. (required for planets to function)
Recoded Planetary atmos to use O2, Super cold O2, and weather to be harsher.
Added a buncha areas to differant mapping z levels, still a lot more to go.
New titlescreen for our server by an artist.
2019-04-12 19:11:48 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
2019-04-07 19:40:12 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814
[MIRROR] [READY]Makes a bunch of processes subsystems instead
2019-03-27 17:46:31 -04:00
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 16:37:45 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Novacat
696872690e Merge pull request #4677 from VOREStation/upstream-merge-5776
[MIRROR] Adds pressure protection bounds to clothing.
2019-03-27 15:18:17 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Neerti
9d46150515 Adds pressure protection bounds to clothing. 2019-03-27 13:26:07 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00