1c2188128c
IP Reputation Checking
2020-01-16 02:56:35 -07:00
de24521619
First merge from upstream
2020-01-13 17:23:01 -07:00
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
930215e3d7
Update loadout_suit_vr.dm
2020-01-11 17:07:29 +01:00
a92437ce23
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Taur-clothes-fix
2020-01-11 07:49:03 +01:00
af97208347
Poncho is now in the loadout as well, with a little pointer to notify people.
...
Poncho is also compatible with drake taur, wolf get janitaurial jumpsuit for the future.
2020-01-11 07:48:36 +01:00
a570cafa2a
Adds taur cloak and dress to loadout
2020-01-11 11:33:58 +10:00
e4f544eb32
Trying to fix FLUFF
2020-01-11 01:20:11 +01:00
6f94d6e05e
Removes YW/VS Fluff ( #110 )
...
* Removes YW/VS Fluff
2020-01-10 21:43:43 +01:00
e26b48d335
Map fixes.
...
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
2020-01-05 01:09:08 -05:00
e8069cd7cd
Whitelist fix
2019-12-30 02:36:29 -07:00
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
5c33de39c1
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore
...
# Conflicts:
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# icons/mob/robots.dmi
2019-12-28 12:00:22 -05:00
38d5113a9b
Finished, fixing maps and shuttles, fluff access.
2019-12-27 15:51:53 -05:00
b6a81efb9a
Merge pull request #6582 from Shadow-Quill/Material-Scanner-Access
...
QM can now get optical meson scanners
2019-12-22 01:59:32 -05:00
b41698c720
Merge branch 'master' into master
2019-12-21 21:35:09 -05:00
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
af25a14c06
Map fixes
...
Map fixes and fixing my fluff item's sprite. It failed a merge forever back.
2019-12-21 00:10:44 -05:00
29e187bb83
Adds 10 new clothes + sprite fixes. ( #6575 )
2019-12-20 00:44:28 -05:00
0432002af7
Merge pull request #6327 from VOREStation/upstream-merge-6558
...
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-19 15:46:59 -05:00
604fd1b74f
Resolve conflicts, fix compile errors
2019-12-19 17:49:21 +00:00
0c074e501a
Fixes loadout webbings/pouches for explorers
...
Fixes loadout webbing vests and drop pouches lacking explorer access despite clearly stating its presence on the display name.
2019-12-19 15:41:03 +02:00
3b7a737c08
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
4fd6dc9868
Fluff Item Fixy
...
Fixes #5992
2019-12-10 09:41:00 -05:00
3c9731879a
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
2019-12-09 17:15:36 -05:00
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
f9688aea70
Edgyness increase
2019-12-08 01:12:17 -05:00
461fcfd160
Fixing medal fluff
2019-12-06 16:10:35 -05:00
b0abdc4491
Merge branch 'master' of https://github.com/Keila-coon/YWPolarisVore
2019-12-01 02:38:56 -04:30
e10c7d4482
Fluff item request updated
...
-Deleted the place holder for the modkit
2019-12-01 02:38:52 -04:30
cbb5a4bdd4
Merge pull request #6246 from TheFurryFeline/patch-9
...
Expired Permit Removal
2019-11-29 22:23:40 -05:00
defff15e24
Update loadout_fluffitems_vr.dm
2019-11-29 20:56:27 -05:00
1de75f06bf
Merge pull request #6548 from Meghan-Rossi/paifix
...
Fix pAI preferences not loading
2019-11-29 19:49:03 -05:00
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
698d5d564d
Merge branch 'master' into master
2019-11-29 13:07:46 -04:00
ac7ffd08b8
Update loadout_fluffitems_yw.dm
2019-11-29 12:28:46 -04:30
228d0df6e3
ditto for medal
2019-11-29 11:02:19 -04:30
47bc5e411e
Invisible Breath Masks
2019-11-28 19:33:46 -05:00
5956dd62d8
Requested Changes
...
Includes commenting out gun that had a permit for it.
2019-11-28 11:06:56 -05:00
0c2c70ce48
Whoops.
...
That feeling when you forget about this little refactor. Pfft.
2019-11-28 09:02:30 -05:00
d0ed6c5702
Fixes Collars Not Spawning
...
Title. Fixes https://github.com/VOREStation/VOREStation/issues/6225
2019-11-25 21:16:26 -05:00
7035e30fc3
Fixed blizzard so animals do not get killed
...
Fixed the exploration shuttle console
Fixed the snowsuits sprites and actually works in cold temp
2019-11-24 16:57:06 -05:00
bafec81a0a
Merge Upstream
2019-11-22 23:40:13 +00:00
0e1b4427fe
Fixes loadout being broken
2019-11-22 13:08:09 +10:00
11ae9361af
Cleans up comments
2019-11-21 20:50:49 -05:00
e7f2ca8055
Hopefully fixes disappearing loadouts
2019-11-22 11:27:28 +10:00
1769dd9e8d
Hopefully makes my fluff-stuff spawn WORN
...
Having a custom bag spawn in my internals box instead of on my back is annoying...also smol name edit because girlfren's character changed the last name spelling of their character and since our characters are married, gotta fix!
but yeah hopefully this fixes it. it worked on private serber.
2019-11-19 23:34:34 -06:00
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
4763d548ab
Merge pull request #6184 from Meghan-Rossi/collartweak
...
Adds a way to set the tag of loadout collars as part of the loadout
2019-11-15 11:59:56 -05:00
Razgriz