 RepedeandGitHub
|
18c418c7cf
|
Merge branch 'master' into teshcollars
|
2020-02-29 22:49:51 -05:00 |
|
|
Repede
|
760a1b4983
|
Merge branch 'teshcollars' of https://github.com/Yawn-Wider/YWPolarisVore into teshcollars
|
2020-02-29 22:38:05 -05:00 |
|
|
Repede
|
d226b77b16
|
fixes clipping not working for Teshari collar
|
2020-02-29 22:37:40 -05:00 |
|
|
Shadow-QuillandGitHub
|
406855ce90
|
Merge branch 'master' into Coda-Fluff-Implant
|
2020-02-29 20:53:42 -06:00 |
|
|
Shadow
|
010821fb7c
|
Fixes Size-Switching
|
2020-02-29 20:53:13 -06:00 |
|
|
RepedeandGitHub
|
218230a79b
|
fixes missing comment
more whoops
|
2020-02-29 09:55:05 -05:00 |
|
|
Repede
|
99670c982c
|
Merge branch 'teshcollars' of https://github.com/Yawn-Wider/YWPolarisVore into teshcollars
# Conflicts:
# code/modules/clothing/under/accessories/accessory_vr.dm
|
2020-02-29 09:48:00 -05:00 |
|
|
Repede
|
faf21c7c99
|
Makes collars more fluff item proof
|
2020-02-29 09:46:37 -05:00 |
|
|
RepedeandGitHub
|
db08d7e1a3
|
updates a comment
whoops
|
2020-02-29 08:55:00 -05:00 |
|
|
RepedeandGitHub
|
988c8cb57d
|
Merge branch 'master' into teshcollars
|
2020-02-29 08:48:31 -05:00 |
|
|
Repede
|
c5db404f04
|
Fixes the basic collars to work on teshari using the poncho abuse system, totally ready to break them fluff collars.
|
2020-02-28 22:48:07 -05:00 |
|
|
Shadow
|
b316782762
|
The implantening
|
2020-02-28 18:42:49 -06:00 |
|
|
Killian
|
c559188fc9
|
Merge branch 'kk-boozetraits' of https://github.com/KillianKirilenko/YWPolarisVore into kk-boozetraits
|
2020-02-28 00:05:17 +00:00 |
|
|
Killian
|
981d867d3d
|
Tier reorganization
lowest tiers made neutral, costs reduced by 1pt each for remaining positive/negative
|
2020-02-28 00:04:59 +00:00 |
|
|
Izac Joof ForsgrenandGitHub
|
52b7a6ac19
|
Merge branch 'master' into kk-boozetraits
|
2020-02-27 19:21:31 +01:00 |
|
|
Killian
|
f89a32e142
|
fixed missing edit tag on new var
|
2020-02-27 10:36:11 +00:00 |
|
|
Killian
|
7d8f4e93a4
|
CHEERS!
|
2020-02-27 10:07:44 +00:00 |
|
|
SplinterGP
|
796d9fdd26
|
Adds grey to cataloguer, adds blurb, minor change in telep, adds spawn
|
2020-02-25 14:15:09 -03:00 |
|
|
SplinterGP
|
9b316c1395
|
Fixes blueshield and fluff cloak correctly
|
2020-02-25 01:13:12 -03:00 |
|
|
SplinterGP
|
5bdd4e6279
|
Fixes fluff and blueshield cloak to work correctly
PARTIALLY
|
2020-02-25 00:20:18 -03:00 |
|
|
Luke ValeandHawk_v3
|
f09c5dd6ed
|
Updates the Collar for the name change and some lore updates.
|
2020-02-23 20:57:21 +00:00 |
|
|
Repede
|
7ff67d6909
|
Fixes typo
|
2020-02-22 12:44:30 -05:00 |
|
|
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 |
|
|
Heroman
|
a6d6cf7825
|
More fixes for broken medical
|
2020-02-19 08:35:37 +10:00 |
|
|
Heroman
|
cdd0885c93
|
Fixes broken tool usability logic for surgery
|
2020-02-18 18:11:35 +10: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 |
|
|
Arokha Sieyes
|
14942ee6c7
|
VS: Don't talk to strangers
|
2020-02-17 12:44:17 -05:00 |
|
|
Arokha Sieyes
|
3cbd51c6d1
|
Don't talk to strangers
|
2020-02-17 12:44:10 -05:00 |
|
|
KillianandGitHub
|
72acdd2dac
|
Merge branch 'master' into kk-traffic
|
2020-02-17 17:35:47 +00:00 |
|
|
Izac Joof ForsgrenandGitHub
|
0554a83b12
|
Merge branch 'master' into YWiconadd
|
2020-02-17 18:08:07 +01:00 |
|
|
Izac Joof ForsgrenandGitHub
|
d2010f54c5
|
Merge branch 'master' into kk-miscstuff
|
2020-02-17 17:44:09 +01:00 |
|
|
Izac Joof ForsgrenandGitHub
|
7831355f08
|
Merge branch 'master' into promwaterchemreagentreadd
|
2020-02-17 17:09:04 +01:00 |
|
|
RepedeandGitHub
|
130ef71bac
|
Merge branch 'master' into promwaterchemreagentreadd
|
2020-02-17 08:24:30 -05:00 |
|
|
Killian
|
dcd691245c
|
feex title
|
2020-02-17 10:35:55 +00:00 |
|
|
NovacatandGitHub
|
33570d10e6
|
Update ore_box.dm
|
2020-02-17 01:33:15 -05:00 |
|
|
NovacatandGitHub
|
332e3271d9
|
Update ore_box.dm
|
2020-02-17 01:31:48 -05:00 |
|
|
NovacatandGitHub
|
e8526a420c
|
Update robot.dm
|
2020-02-17 01:30:10 -05:00 |
|
|
NovacatandGitHub
|
5ea36b7a60
|
Update robot_movement.dm
|
2020-02-17 01:29:20 -05:00 |
|
|
AtermoneraandVirgoBot
|
c5b6dfa259
|
Fixes mining borg ore box movement astral sorcery
|
2020-02-17 01:18:31 -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
|
719e7f8b6c
|
2 new sdf events
|
2020-02-16 23:41:46 +00:00 |
|
|
SplinterGP
|
3cce28075b
|
Adds AMI helmet and suit sprite for vulps, and more
Adds ami helmet and suit sprite for vulps, also adds magboots and gloves sprite but these adds to all species
|
2020-02-16 17:30:06 -03:00 |
|
|
Killian
|
efe1b16344
|
Update organizations.dm
|
2020-02-16 08:02:18 +00:00 |
|
|
KillianandGitHub
|
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 |
|