Spades
5a0a3665f9
Map changes
...
- Because mice spawn from trash piles, they no longer exist on the map.
- Added some vents in places that were neglected.
- Added extra trash pit access.
- Added weapon permits to HoS office.
- Changed permits to match Polaris's simpler permits.
- Removed expired permits.
- Removed expired weapons.
- Fixed escape pod base turfs.
- Removed all remaining shatterproof windows.
- Fixed redundant window types.
2017-08-31 22:13:31 -04:00
Cameron653
a77c6d76eb
Update custom_items_vr.dm
2017-08-29 18:36:08 -04:00
killer653
1d7d778431
Ckey check
2017-08-29 17:28:59 -04:00
killer653
c5ae135759
Kitchi injector fix
2017-08-29 17:28:43 -04:00
killer653
90d38cefb2
Ketrai fluff adjustments
2017-08-29 16:44:22 -04:00
Kelshark
3120de04a4
Madoka armor sprite update
2017-08-28 23:01:50 -04:00
killer653
e2ea7951d3
Teshari stuff was added to Polaris.
2017-08-28 21:22:05 -04:00
Ketrai
a627e5053e
fixes indentation
...
Lessons learnt, frijnnghh
2017-08-28 22:41:01 +02:00
Ketrai
035ce3a7a6
adds primal boxes
...
yada yada adds those 4 monkeys in boxes
2017-08-28 21:37:21 +02:00
Cameron653
3b5648282d
Update custom_items_vr.dm
2017-08-26 20:02:25 -04:00
Cameron653
4d8d327284
Update custom_items_vr.dm
2017-08-26 19:48:10 -04:00
Cameron653
63cc4489b1
Update custom_items_vr.dm
2017-08-26 19:33:55 -04:00
Cameron653
0db9b961ec
Update custom_items_vr.dm
2017-08-26 19:20:00 -04:00
Kelshark
27eb2f7a31
Merge branch 'master' of https://github.com/Repede/YawnWiderStation
2017-08-26 00:20:22 -04:00
Kelshark
9731980d65
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-08-26 00:20:09 -04:00
izac112
d704e1b751
Cig fix and some prep
2017-08-26 02:52:45 +02:00
killer653
eb48f05509
Adds Xenneth custom ID
2017-08-20 21:28:16 -04:00
izac112
d4e3882568
aand this
2017-08-19 18:45:17 +02:00
izac112
e78cef5fc9
Fixes fluff being in the loudouts
2017-08-18 17:11:28 +02:00
Kelshark
f2f35697fb
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/datums/supplypacks/engineering.dm
# code/modules/mob/living/silicon/robot/robot_modules_vr.dm
# code/modules/vore/appearance/spider_taur_powers_vr.dm
# code/modules/vore/resizing/resize_vr.dm
# config/custom_items.txt
# icons/mob/vore/taurs_vr.dmi
2017-08-18 08:14:12 -04:00
Kelshark
60c28b9074
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/vore/appearance/sprite_accessories_vr.dm
# config/custom_items.txt
# icons/mob/vore/taurs_vr.dmi
2017-08-14 17:27:13 -04:00
JOAN-RIG\Joan Risu
3e0825b66b
Tasald permit renewal and revolver description tweaks
2017-08-08 15:05:33 -07:00
Spades
7c781e122c
Final commit
2017-08-08 01:01:02 -04:00
killer653
4fcbbe40f1
Size changes.
2017-07-28 06:43:44 -04:00
Spades
e173da0603
Merge pull request #1902 from DarkWolfInsanity/IvyIDFix
...
Ivy Baladeva ID Fix
2017-07-26 20:11:24 -04:00
Cinder
57efcfe8dc
Ivy ID Fix
...
Forgot the bag. oops
2017-07-25 10:21:25 -05:00
killer653
153641cabe
Fixes conflict
...
Fixes conflict
2017-07-25 08:58:36 -04:00
Cinder
5e6a8fb4a0
Fixes Ivy Baladeva's ID issues
...
Instead of making a new ID that doesn't get her access rights, make a reprinter instead that just changes the icon and description
2017-07-25 00:04:24 -05:00
Cameron653
a5d54f1bac
Removes whitespace.
2017-07-23 19:11:56 -04:00
killer653
3a5da61430
Adds Roiz's custom coat
2017-07-23 16:23:32 -04:00
Cameron653
a516a0d041
Adds L and R hand sprites
2017-07-23 10:47:26 -04:00
killer653
016337ee4d
Quick, small fix.
2017-07-21 04:02:49 -04:00
killer653
8fbf7fc176
Adds Natje's fluff items
2017-07-21 03:02:52 -04:00
Kelshark
949a012a18
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# config/custom_items.txt
# icons/mob/vore/taurs_vr.dmi
# maps/tether/tether_defines.dm
2017-07-20 15:50:53 -04:00
Spades
a04bca6da9
Merge pull request #1863 from Ketrai/patch-1
...
Add approved fluff item: pink bear hat.
2017-07-19 12:26:48 -04:00
Ketrai
55402f1c73
Update custom_clothes_vr.dm
2017-07-18 20:53:51 +02:00
Ketrai
ac9440956b
Add approved fluff item: pink bear hat.
...
link to approved form : https://forum.vore-station.net/viewtopic.php?f=26&t=956
First time I'm adding fluff, no idea if this is how I'm supposed to do it, just tried to follow the instructions.
2017-07-15 19:43:40 +02:00
Cameron653
b7608f81e8
Fixes code up.
2017-07-13 17:12:46 -04:00
killer653
c736b6f824
Everything works except for the loadout spawn
...
Work on later.
2017-07-13 10:15:26 -04:00
Spades
a349e389c2
Update custom_clothes_vr.dm
2017-07-12 13:06:39 -04:00
kcin2001
97a5269bfd
Update custom_clothes_vr.dm
2017-07-12 02:04:27 -07:00
Spades
6434fa862d
Update custom_clothes_vr.dm
2017-07-10 22:58:15 -04:00
kcin2001
612b5b94c3
minor changes as requested
2017-07-10 18:56:28 -07:00
kcin2001
e706cd80f0
adds a description to the undercoat
2017-07-09 22:18:01 -07:00
kcin2001
2b6e33df2e
new tesh items - code edition
2017-07-09 21:58:04 -07:00
killer653
c4a2caba2e
Duplicate of #1799
2017-07-05 12:07:21 -04:00
Spades
3db35eb684
Dakka Dakka
...
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
Kelshark
7b91330ac1
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-06-23 15:17:00 -04:00
Kelshark
60f5539fc7
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# vorestation.dme
2017-06-18 17:26:56 -04:00
Kelshark
ab85a2c376
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/silicon/robot/robot_modules_vr.dm
# code/modules/resleeving/infocore_records.dm
# config/custom_items.txt
# config/jobwhitelist.txt
# icons/mob/widerobot_vr.dmi
# vorestation.dme
2017-06-18 15:35:35 -04:00
