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
Repede
7fc70caa43
Resetting master
2020-02-22 12:28:01 -05:00
Killian
d7f156ac13
fashion attack 2: jackets
2020-02-19 22:45:01 +00:00
Repede
1950b800d0
Rin Deimos fluff item, just a crystal that does nothing.
2020-02-18 19:33:17 -05:00
Meghan-Rossi
dfc42293c7
Fluff items and species whitelisting
...
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
2020-02-18 00:27:36 +00:00
Killian
891761e96a
quickfix
2020-02-17 21:49:36 +00:00
Killian
72acdd2dac
Merge branch 'master' into kk-traffic
2020-02-17 17:35:47 +00:00
Izac Joof Forsgren
d2010f54c5
Merge branch 'master' into kk-miscstuff
2020-02-17 17:44:09 +01:00
Repede
130ef71bac
Merge branch 'master' into promwaterchemreagentreadd
2020-02-17 08:24:30 -05:00
SplinterGP
aa4f6a2e94
Adds aroozee fluff item
2020-02-16 22:35:41 -03:00
Killian
d39ed8d0f2
glasses!
2020-02-17 00:29:44 +00:00
Killian
77268ada27
Merge branch 'master' into kk-traffic
2020-02-16 07:00:56 +00:00
Killian
92e988d3c4
edit comments
2020-02-16 06:34:09 +00:00
Killian
76f4ffe0de
traffic!
2020-02-16 05:28:11 +00:00
Cebutris
a3a22796ae
hot hot egg
2020-02-14 17:11:10 -05:00
Arokha Sieyes
74c6f7c1e7
Rename "Aronai Kadigan" -> "Aronai Sieyes"
2020-02-14 11:06:04 -05:00
Aronai Sieyes
641ed43b23
This one should be WRITE_LOG
2020-02-13 12:21:03 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Killian
7d0bed5e4f
add new clothes
2020-02-05 21:50:32 +00:00
Atermonera
1f227a9b55
Merge pull request #6664 from PrismaticGynoid/loadouttoys
...
Adds some toys to the loadout
2020-02-03 20:50:45 -05:00
Shadow
ca7fd68c99
Fluffi Item
2020-02-02 15:16:31 -06:00
Arokha Sieyes
2b01382eed
Needs to return true
2020-01-31 15:11:33 -05:00
Arokha Sieyes
aa528264dd
Add some vorestation-specific IPR things
2020-01-31 14:53:52 -05:00
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Repede
6f3ea86aaa
Merge branch 'master' into ringtones
2020-01-23 18:48:20 -05:00
Cebutris
9bde77ed63
ringtone >> ttone
2020-01-23 18:44:00 -05:00
Cebutris
546de503d0
remove kh
2020-01-22 03:03:34 -05:00
Cebutris
70fa53cb2c
beep
2020-01-22 02:59:41 -05:00
Novacat
b0b60d051e
Update client procs.dm
2020-01-21 18:56:54 -05:00
Atermonera
44d334a37c
IP reputation checking
2020-01-21 18:11:29 -05:00
Cebutris
3450336020
does the thing, and another thing
2020-01-20 13:44:02 -05:00
Verkister
fa0a6d88a8
Fixes loadout index runtime spam ( #6626 )
...
sanity checks saving the day once more.
2020-01-16 02:56:04 -05:00
Atermonera
28a1d8669c
Merge pull request #6614 from Shadow-Quill/Psyche-Turtleneck
...
Psychiatrists can now properly get the medical turtleneck via loadout
2020-01-15 23:09:19 -05:00
Aronai Sieyes
9f7d58f246
Remove stray N (don't port this, it's in a VS edit)
2020-01-15 14:52:15 -05:00
Aronai Sieyes
e67419d8cc
IP reputation checking
2020-01-15 14:30:41 -05:00
Verkister
2b9f48c74f
Adds sound alert for paranoia logging
...
criminal detected
2020-01-14 22:52:23 +02:00
Cebutris
0773e06bc6
oops
2020-01-13 19:51:31 -05:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Kates
930215e3d7
Update loadout_suit_vr.dm
2020-01-11 17:07:29 +01:00
lbnesquik
a92437ce23
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Taur-clothes-fix
2020-01-11 07:49:03 +01:00
lbnesquik
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
Heroman
a570cafa2a
Adds taur cloak and dress to loadout
2020-01-11 11:33:58 +10:00
RadiantFlash7
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
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Repede
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
Repede
38d5113a9b
Finished, fixing maps and shuttles, fluff access.
2019-12-27 15:51:53 -05:00
Atermonera
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
Repede
b41698c720
Merge branch 'master' into master
2019-12-21 21:35:09 -05:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
RadiantFlash7
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
