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
RadiantFlash7
909393115d
Merge pull request #8 from Yawn-Wider/master
...
Updating my Branch
2020-04-03 22:34:31 -04:00
RadiantFlash7
687d74f651
Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore
2020-04-03 22:14:43 -04:00
RadiantFlash7
8692c589f1
Security update++ Geigers and more
...
Rebuilds security to /not/ suck.
Left Vacant office for security Next to HoS office, for the Security Pilot Officer (To be added in future)
Dock for Interceptor left near sec.
New Geigers added around the map!
Vents and scrubber fixes.
adds in HoP req console which was not in by default.
2020-04-03 22:14:39 -04:00
Aronai Sieyes
94d6ccd763
Merge pull request #7117 from VOREStation/aro-lookingglass
...
Add Looking glass holodeck
2020-04-03 15:14:00 -04:00
Aronai Sieyes
97986327bd
Merge pull request #7119 from VOREStation/upstream-merge-6904
...
[MIRROR] Clean up various things
2020-04-03 13:15:16 -04:00
Aronai Sieyes
b82c48ee2c
Merge pull request #7112 from Novacat/nova-shuttle
...
Adds Mechanicus Techpriest Robes
2020-04-03 13:11:33 -04:00
Novacat
ae4c21b931
Merge pull request #7120 from VOREStation/upstream-merge-6927
...
[MIRROR] Adjust turret target finding process
2020-04-03 12:58:24 -04:00
Aronai Sieyes
67dd92e196
Merge pull request #7111 from Heroman3003/slottening
...
Gives slots to most fluff items
2020-04-03 12:35:12 -04:00
Aronai Sieyes
763608fc36
Update portable_turret.dm
2020-04-03 12:25:47 -04:00
Aronai Sieyes
496a34ab2b
Update grown.dm
2020-04-03 12:24:58 -04:00
Aronai Sieyes
58dc70861c
Update unsorted.dm
2020-04-03 12:23:21 -04:00
Atermonera
2789cbe639
Adjust turret target finding process
2020-04-03 03:16:23 -04:00
Atermonera
d7a9416bb8
Clean up various things
2020-04-03 03:15:06 -04:00
Aronai Sieyes
307bea35d9
Fix console html tag
2020-04-03 00:17:39 -04:00
Aronai Sieyes
e39494a87f
VS: Vorey holodeck things
2020-04-02 23:43:13 -04:00
Aronai Sieyes
74134e4ac9
Looking Glass Holodecks
2020-04-02 23:42:47 -04:00
Aronai Sieyes
df58a60554
Fix mines qdel
2020-04-02 20:28:40 -04:00
Aronai Sieyes
6ac1c2b2fa
VS: Remove unused vorestation edits
2020-04-02 20:23:56 -04:00
Heroman
1ae1900cd3
Fixes a random v
2020-04-03 10:13:23 +10:00
Heroman
7e3019971d
Fixes identetions
2020-04-03 10:08:49 +10:00
Unknown
6d7cb1cf7a
Adds Mechanicus Techpriest Robes
...
https://www.youtube.com/watch?v=ztzq05IzYds
Adminbus Only.
2020-04-02 19:44:21 -04:00
Heroman
525bbb5650
Gives slots to most fluff items
2020-04-03 09:01:39 +10:00
Unknown
dbf10c7dbf
Finishes this PR
2020-04-02 18:28:21 -04:00
Unknown
37c563d56c
I should be more consistent in naming things
2020-04-02 15:04:53 -04:00
Unknown
575ac1018a
Voidsuit Additions
...
- Adds a Captain's voidsuit for the Captain, replaces the old Colony Director armor.
- Adds a Prototype Voidsuit. Currently has mercenary voidsuit stats and does not spawn in anywhere.
- Adds new cyclers for the new voidsuits.
2020-04-02 14:59:19 -04:00
Aronai Sieyes
edb63dc978
Merge pull request #7104 from VOREStation/aro-blahtercooler
...
Remove watercooler shields until Joan does icons
2020-04-02 11:37:42 -04:00
Aronai Sieyes
a2bf4c602a
Remove watercooler shields until Joan does icons
2020-04-02 11:23:52 -04:00
Aronai Sieyes
2f31a3dbe6
Account DB console icon fix
2020-04-02 11:20:56 -04:00
Aronai Sieyes
1626df366c
Merge pull request #7102 from VOREStation/aro-fakez
...
Improves space edge-of-map behavior and add mapping tools
2020-04-02 10:58:13 -04:00
Aronai Sieyes
e406481227
Merge pull request #7096 from VOREStation/upstream-merge-6859
...
[MIRROR] Port Bay computer icons
2020-04-02 10:58:02 -04:00
Aronai Sieyes
d16b19949d
Merge pull request #7095 from VOREStation/upstream-merge-6912
...
[MIRROR] [PORT] Speed up map load significantly
2020-04-02 10:57:40 -04:00
Aronai Sieyes
ff718f4aef
Merge pull request #7085 from KasparoVy/i-could-swear-kobolds-ate-rocks
...
Adds Ore/Gem Eater Trait
2020-04-02 10:55:36 -04:00
Aronai Sieyes
ef32afa133
Merge pull request #7083 from VOREStation/vplk-pointdefense
...
Port Point Defense Batteries
2020-04-02 10:53:29 -04:00
Aronai Sieyes
a7d5b37488
Merge pull request #7081 from VOREStation/aro-flip
...
Improves *flip, adds Traceur trait
2020-04-02 10:53:10 -04:00
Aronai Sieyes
bedcdd8d0c
Merge pull request #7082 from Heroman3003/colorwraps
...
Makes cloth footwraps colorable in loadout
2020-04-02 10:52:58 -04:00
Aronai Sieyes
9e00215790
Merge pull request #7075 from VOREStation/aro-multiwngs
...
Allow wings with a secondary color
2020-04-02 10:52:37 -04:00
Atermonera
df77f1bcf2
Port Bay computer icons
2020-04-02 10:30:21 -04:00
Aronai Sieyes
f080a4baf3
[PORT] Speed up map load significantly
2020-04-02 10:25:03 -04:00
KasparoVy
ddb22e8e97
Merge branch 'i-could-swear-kobolds-ate-rocks' of https://github.com/KasparoVy/VOREStation into i-could-swear-kobolds-ate-rocks
2020-04-02 09:53:49 -04:00
KasparoVy
5ba1fda952
Slight Grammar Adjustment
2020-04-02 09:53:25 -04:00
Aronai Sieyes
09003a6c61
Improve space map edges
2020-04-02 01:08:07 -04:00
ArgobargSoup
5b21fa1ff5
Makes fish meat non-toxic, attempt number 2
2020-04-01 21:39:24 -07:00
KasparoVv
af2b83379a
Add VS Edit
...
Arokha's recommendation
Co-Authored-By: Aronai Sieyes <arokha@arokha.com >
2020-04-02 03:31:43 +00:00
Atermonera
4f50c50452
Merge pull request #6928 from VOREStation/pol-runtimes
...
Fix 2 runtimes
2020-04-01 22:39:14 -04:00
KasparoVy
bb756cbdc9
Adds a Rocky Diet
...
Taking the ore eater trait, you only gain nutrition from ore.
The amount varies, mainly based on the rarity/quality of what you're eating.
5 raw diamonds or verdantium will feed you well, while it'll take a handful of hematite or carbon to do the job. Better stick to the good stuff - it's in your best interest!
2020-04-01 21:52:27 -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
Leshana
0377e6b4eb
Only attempt to initialize a machine's circuit if its actually a type path!
2020-04-01 20:36:22 -04:00
Leshana
23482e88fa
Moves topic return value defines to where they are usable everywhere.
2020-04-01 20:36:00 -04:00
Heroman
91291fb6b2
Makes cloth footwraps colorable in loadout
2020-04-02 09:34:31 +10:00
