Commit Graph

775 Commits

Author SHA1 Message Date
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
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
RadiantFlash7
fc1015a0a6 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-02-07 19:57:01 -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
Killian
7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Hawk_v3
4c18d156cd Actual fix.
Commas MUST go on the end of comments in the middle of a list. The fail is normally the line ABOVE the one Travis reports.
2020-01-13 19:06:19 +00:00
Hawk_v3
f36bda0ffd Or is this the list fix? I can't read AWK and regex.
I know where the file IS, just...
2020-01-13 19:01:15 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Holdelta
9c7e1f82af Fixing Travis formatting part 2
Adding a parenthesis at the end of a comment because Travis.
2020-01-12 15:44:47 -08:00
Hawk_v3
697641a913 Indentation Fix
Travis checks for proper closure. While this might not actually fix it, it's expecting to see ) at the end of the line, as I've run into this one before.
2020-01-12 23:30:34 +00:00
Holdelta
a306d5fd4e Update engineering.dm 2020-01-11 23:34:21 -08:00
Holdelta
0624435524 Update engineering.dm 2020-01-11 23:32:56 -08:00
Heroman
b5f0e0affe Fixes wrong gasmask in xenoflorist locker 2020-01-11 10:39:08 +10:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
TheFurryFeline
71a99a94c0 Derp
Comments, please.
2020-01-02 13:49:31 -05:00
TheFurryFeline
716741d67f Redo of Mapfix Palooza Round One
Redoing Mapfix Palooza with notable changes being the re-removal of the NSFW gun with comment for YW's removal. Keeping the dorm additions undone pending a followup PR.

Changelog Notes:

- Removes random SMES in maints mapped in for Research.

- Rearranges items in HOS Office and adds gear closet with weapon power cell.

- Add AR-B glasses to CD Office and plain AR glasses to HOP.

- Add missing shortwave radios to the bridge.

- OR rooms rearranged.

- - Anasthetic wall pumps added.

- - Anasthetic wall closets removed.

- - Surgery tools, table, monitor, IV drips moved.

- - Add anesthetic floor-based closets as a reserve.

- - Minor increase in area size.

- Exploration rewards vendor moved to explorer areas on outpost. Deletes the one in Research wall. Also rearranges spawnpoints for explorers on the surface.

- Add medical access to field medic section at Main Outpost FA Station.

- Add Mining redemption vendor. Resolves #28

- Moves lights in several places to not be in the same spot as cameras.

- Fixes APCs at Xenoresearch being turned off as well as access into the sub-department. Also removes exploration vendor.

- Internal second button added in engine room for going in and out of the SMES room.

- Mech Bay shutter name fix. Was labelled Mining Storage.

- Fixes blindspots for cameras.

- Railings for hangar bays for safety reasons.

- Door access fixes.

- - Remove access restrictions on FA Stations.

- - Fix access for Red Armoury preventing HOS entry.

- - Fix access for surface teleporter room preventing RD entry.
Fix access for CE into T-comms. Resolves #24

- - Gives Armoury what it had for Northern Star.

- Dorm tweaks.

- - Locks added to heads' bedrooms on deck 3 as well as visitor rooms on deck 3.

- Increases main power SMES energy amount.

- Remove extra AI Status Display Monitor in QM Office.

- Add a bunch of brollies to hangar bays, explorer lockers, and field medic lockers. Resolves #60

- Add Body Designer to Medbay Lobby. Also adds the box that goes with it. Resolves #23

- Adds Erik's Lungs back. Rejoice, you food pupper! Closes #48

- Adds Timeclocks for switching on/off duty.

- Adds a bino to each exploration locker for FMs and Explorers. Resolves #67

- Gives QM a fax machine and adds 2 more public ones. One at new dorms and the other at the library.
2020-01-02 13:09:20 -05:00
Razgriz
180efa5a50 Remove NSFW gun
Locker already has the X01 gun.
2020-01-02 05:57:15 -07:00
TheFurryFeline
2bbd16372a Derp 2019-12-31 20:20:50 -05:00
TheFurryFeline
d191dc6b88 Mapfix Palooza Round One
Changelog Notes:

- Removes random SMES in maints mapped in for Research.

- Rearranges items in HOS Office and adds gear closet with weapon power cell. Also re-add NSFW gun that was commented out.

- Add AR-B glasses to CD Office and plain AR glasses to HOP.

- Add missing shortwave radios to the bridge.

- OR rooms rearranged.

- - Anasthetic wall pumps added.

- - Anasthetic wall closets removed.

- - Surgery tools, table, monitor, IV drips moved.

- - Add anesthetic floor-based closets as a reserve.

- - Minor increase in area size.

- Exploration rewards vendor moved to explorer areas on outpost. Deletes the one in Research wall. Also rearranges spawnpoints for explorers on the surface.

- Add medical access to field medic section at Main Outpost FA Station.

- Add Mining redemption vendor. Resolves #28

- Moves lights in several places to not be in the same spot as cameras.

- Fixes APCs at Xenoresearch being turned off as well as access into the sub-department. Also removes exploration vendor.

- Internal second button added in engine room for going in and out of the SMES room.

- Mech Bay shutter name fix. Was labelled Mining Storage.

- Fixes blindspots for cameras.

- Railings for hangar bays for safety reasons.

- Door access fixes.

- - Remove access restrictions on FA Stations.

- - Fix access for Red Armoury preventing HOS entry.

- - Fix access for surface teleporter room preventing RD entry.

- Gives Armoury what it had for Northern Star.

- Dorm additions and tweaks.

- - Space dorms on deck 1 added so everyone doesn't have to go straight to the surface for private fun.

- - Locks added to heads' bedrooms on deck 3.

- - Moves an antag thingy out of the way to the west side of deck 1.

- Increases main power SMES energy amount.

- Remove extra AI Status Display Monitor in QM Office.
2019-12-31 19:22:13 -05:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder
Centcom/Tether Ship Changes
2019-12-06 16:06:56 -05:00
Unknown
199fffc2d0 Refactors translocators a bit more 2019-11-28 14:22:56 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Atermonera
4eb1e378f6 Merge pull request #6447 from TheFurryFeline/TFF-Orange_Is_The_New_Orange_Part_2
Orange Is The New Orange Part 2
2019-09-25 17:09:00 -04: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
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange
Freebie Orange Jumpsuit
2019-08-12 14:40:23 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Heroman
54be18505b Removes the leaks and related mechanics 2019-07-31 09:25:07 +10:00
Mechoid
5864447d5d Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my. (#6279)
* Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.

* Fix processing fuckery.

* Deal with Forever-Seals, and Infini-clamps.

* Update clamp.dm
2019-07-24 04:46:28 -04:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Heroman
2965503cbd Adds new GPSs 2019-07-02 12:04:17 +10:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
RadiantFlash7
1330ad2a07 Fixing broken code from merge\
Fixing missing map animals and missing icon files.
2019-04-14 15:37:22 -04:00
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
RadiantFlash7
025c358c84 Merge remote-tracking branch 'Repede/master' 2019-04-12 19:54:17 -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
Unknown
7ecddb11de Service Keys Too 2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1 Command key box 2019-04-03 15:11:06 -04:00
Novacat
9fd697e007 Merge pull request #4873 from VOREStation/upstream-merge-5997
[MIRROR] Beakers for Botany
2019-03-28 22:02:37 -04:00