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
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
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
Novacat
f73a757152
Merge pull request #4924 from VOREStation/upstream-merge-6025
...
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 14:56:27 -04:00
Unknown
c4860391b6
Conflict Resolution
2019-04-06 14:47:21 -04:00
Novacat
2be62bd672
Merge pull request #4922 from Novacat/nova-survival
...
Post-release Bugfixing
2019-04-06 13:50:00 -04:00
Unknown
0482da8c52
Ports two polaris bugfix PRs early
2019-04-06 12:21:24 -04:00
Neerti
1d59d8683c
Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 05:07:05 -04:00
Neerti
b9b14144b0
Merge pull request #6036 from PrismaticGynoid/butchershack
...
Butcher shack PoI
2019-04-06 05:00:42 -04:00
Novacat
d7c7c073a5
Merge pull request #4868 from Novacat/nova-weapons
...
Adds liquidprotein rations
2019-04-05 17:17:53 -04:00
Heroman
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10: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
Heroman
9b56460487
Fixes a typo
2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9
Fixes passive and mostly passive mobs blocking the way all the time
2019-04-02 09:27:24 +10:00
Unknown
71ac951395
Merge remote-tracking branch 'VOREStation/master' into nova-weapons
2019-03-31 14:35:10 -04:00
Unknown
9197cfeaeb
New Bluespace Sprites
2019-03-31 04:35:24 -04:00
Novacat
da63d0bacf
Merge branch 'master' into nova-weapons
2019-03-30 23:00:48 -04:00
Unknown
9fa575698b
Conflict Resolution
2019-03-30 20:13:49 -04:00
Neerti
5967a92f02
Lynx Fixes Runtimes
2019-03-30 18:51:00 -04:00
Neerti
f8c9664178
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
Novacat
63c6e7f308
Ports Stasis Cages from Baystation ( #6017 )
...
* Ports Stasis Cages from Baystation
2019-03-30 14:55:52 -04:00
Unknown
5ce5403b17
Apparently it exists and is in the wrong dmi
2019-03-30 00:52:46 -04:00
Unknown
42991bb551
Replaces clutch purse sprite
...
Sprite is temporary, but makes the item usable.
2019-03-30 00:19:09 -04:00
Unknown
9c80690186
Adds liquidprotein rations
...
For obligate carnivores.
- Adds liquidprotein rations, they can be found in exploration, sweatmax vendors, and shelter capsules.
- Ups the price for protein shakes to discourage hoarding.
2019-03-29 09:40:24 -04:00
Unknown
d7e248a09e
Might need a little help for the last two...
2019-03-29 00:12:32 -04:00
Unknown
baffac60fc
Lynx Fixes Runtimes
...
There are still a couple of remaining runtimes...
2019-03-28 23:50:37 -04:00
Novacat
4801fe8c8e
Merge pull request #4860 from Heroman3003/id-restorer
...
Added ID restoration terminal
2019-03-28 22:03:17 -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
Novacat
d53ef70473
Merge pull request #4848 from VOREStation/upstream-merge-5996
...
[MIRROR] Fixed construction of fulltile electrochromic windows
2019-03-28 22:01:16 -04:00
Novacat
e2afa12e38
Merge pull request #4841 from VOREStation/upstream-merge-5992
...
[MIRROR] Departmental Turtlenecks
2019-03-28 22:00:31 -04:00
Novacat
26660c5f70
Merge pull request #4832 from VOREStation/upstream-merge-5985
...
[MIRROR] Subspace Jammer now blocks signalers, suit sensors, lasts longer
2019-03-28 21:59:48 -04:00
Novacat
e47a99824c
Update jammer.dm
2019-03-28 21:46:37 -04:00
Unknown
3aa0fdfda5
Removes conductive flags from VR stuff
2019-03-28 21:45:38 -04:00
Neerti
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
Novacat
956809d681
Merge branch 'master' into upstream-merge-5985
2019-03-28 21:32:18 -04:00
Novacat
4c7370fb5d
Merge pull request #4811 from VOREStation/upstream-merge-5981
...
[MIRROR] Handtele no longer relies on teleporter being mapped in in very specific way
2019-03-28 21:28:30 -04:00
Novacat
bada08276f
Merge branch 'master' into upstream-merge-5959
2019-03-28 20:30:41 -04:00
Novacat
3f659d909c
Merge pull request #4758 from VOREStation/upstream-merge-5947
...
[MIRROR] Rewrites Atmospherics
2019-03-28 20:22:30 -04:00
Unknown
d3837b76e8
Conflict Resolution
2019-03-28 19:41:16 -04:00
Anewbe
8ed384b38c
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
Unknown
32bab4ba00
...Part two
2019-03-28 19:08:04 -04:00
Unknown
58427861e8
Fixes compile error
2019-03-28 19:06:53 -04:00
Unknown
4df295de75
Conflict Resolution
2019-03-28 18:43:38 -04:00
Mechoid
023815e2d2
Flash rebalance.
2019-03-28 18:23:33 -04:00
Novacat
65cd059497
Merge pull request #4751 from VOREStation/upstream-merge-5869
...
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 18:17:11 -04:00
Novacat
aab0d4625e
Merge pull request #4759 from VOREStation/upstream-merge-5935
...
[MIRROR] Nerfs Sonic Speed Wheelchair
2019-03-28 17:43:33 -04:00
Novacat
f797a8a715
Merge pull request #4728 from VOREStation/upstream-merge-5899
...
[MIRROR] Ghosts who antagHUD can't make communicator calls
2019-03-28 17:25:35 -04:00
Novacat
4040039d70
Merge pull request #4730 from VOREStation/upstream-merge-5912
...
[MIRROR] Mechs can travel to the mines again
2019-03-28 17:25:06 -04:00
