Commit Graph

527 Commits

Author SHA1 Message Date
Novacat
6536770991 Merge pull request #5837 from Novacat/nova-ert
Centcom Tweaks
2019-09-13 21:34:33 -04:00
Unknown
ccbcdf55c0 Another all access ID removed 2019-09-13 20:34:56 -04:00
Mewchild
e77a66dcc3 Refactors Fluff Items, moves them to be loadout options 2019-09-10 04:59:10 -05:00
Unknown
a94aaac8fb More tweaks 2019-09-09 23:37:41 -04:00
Cyantime
eac30eb7e1 Gives Burrito their uniform back 2019-09-01 19:18:14 -04:00
Novacat
5eaebcf0df Merge pull request #5757 from Rykka-Stormheart/shep-dev-phaser-buff
Buff Frontier Phasers by reducing charge time to sub-30 seconds.
2019-08-31 17:21:08 -04:00
Novacat
ca6c795661 Update custom_guns_vr.dm 2019-08-31 17:07:30 -04:00
Rykka
ae2086b288 Updates as per review. 2019-08-31 15:01:00 -06:00
Rykka
a51070d192 Fix var/phase_power defined twice 2019-08-31 14:34:00 -06:00
Rykka
86a4b20a36 Updated values as per Novacat's Review 2019-08-31 14:31:18 -06:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Rykka
1ac0fd8648 Reduces Phaser Charge Time to sub-30 seconds 2019-08-31 12:58:19 -06:00
Novacat
1f547beef5 Merge pull request #5731 from Novacat/nova-heterochromia
Buffs Mini Translocator
2019-08-31 01:37:40 -04:00
Unknown
1607c10755 Suggested Changes 2019-08-29 04:04:32 -04:00
Unknown
9390884ca7 Buffs Mini Translocator
- Removes Z level restriction on mini translocator
- Decreases charge cost of mini translocator from 2400 to 480
- Mini Translocator starts with a device cell instead of a weapon cell
- Removes illegal tech level from Mini translocators

The overall effect is that mini translocators still start off with one charge and one beacon, but can now be used across z levels. Mini translocators can also be equipped with a weapon cell that gives them five charges instead of one.
2019-08-29 00:20:02 -04:00
Unknown
20d87447a9 Removes HoS Voidsuit Stats 2019-08-28 01:24:48 -04:00
CRTXBacon
1b368e978d Update custom_items_vr.dm 2019-08-20 00:11:26 +01:00
chaoko99
151043ad85 Fixes Chaoko99's custom item. 2019-08-13 19:06:29 -07:00
if there were two guys on the moon
62b14805d5 adds ml3m to closets and stuff 2019-07-27 16:16:10 +01:00
chaoko99
ca099753a4 adds chaoko99's custom item 2019-07-25 20:59:44 -07:00
if there were two guys on the moon
163ac56503 sprites and map fix 2019-07-22 23:20:00 +01:00
if there were two guys on the moon
d803b557fd ML3M 2019-07-19 08:32:24 +01:00
Heroman
dea577a951 Updates fluff item lists 2019-06-09 15:40:38 +10:00
Unknown
d9ec13eaf8 Purges expired permits 2019-04-26 00:08:01 -04:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Heroman3003
d4d08be880 Fixes harpoon targeting obstructed tiles 2019-04-17 09:11:59 +10:00
Unknown
7dcbc669a2 Fixes Evian's Egg Implant
It was in a different part of the file so I missed it.
2019-04-12 23:22:28 -04:00
Heroman
148511e6b0 Fixes some issues with BSH 2019-04-08 16:34:36 +10:00
Heroman3003
e0e9158739 Loadout adjustments for access and swimsuits 2019-04-08 10:19:21 +10:00
Unknown
4420f0cb81 Fixes Resh's Navy blue HoS Jacket 2019-04-06 13:36:39 -04:00
Unknown
a6732daecc Fixes egg implants 2019-04-03 15:11:06 -04:00
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Novacat
44e3511842 Merge pull request #4812 from TheFurryFeline/patch-1
Add Resh's HOS Coat
2019-03-28 21:28:50 -04:00
Novacat
65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 18:17:11 -04:00
Novacat
9759df2de4 Merge pull request #4756 from TheFurryFeline/TFF-Vakashi_Permit
Vakashi's Permit
2019-03-28 17:40:23 -04:00
Unknown
ad181e797a Conflict Resolution
Also fixes a compiling error with previous PR
2019-03-28 17:24:03 -04:00
Novacat
77db377d61 Merge pull request #4748 from Heroman3003/mlembulance
Tempest's saddlebags now double as ambulance siren/light
2019-03-28 16:39:37 -04:00
Novacat
f98177b682 Merge pull request #4741 from Jwguy/Silver-KoyoFluffApp
Adds Koyo's Fluff Item Box
2019-03-28 16:34:41 -04:00
Unknown
cf39c61c2d Conflict Resolution
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
TheFurryFeline
02ef9c29ed Typo fix 2019-03-01 15:05:47 -05:00
TheFurryFeline
eaf41744e1 Typo fix 2019-03-01 15:05:18 -05:00
TheFurryFeline
997fe12dc7 Minor Change
Phi Ahkeen -> Phi Viesti
2019-03-01 14:16:47 -05:00
TheFurryFeline
e167b25f4c Add Resh's HOS Coat
So, I saw a thing on forums here, https://forum.vore-station.net/viewtopic.php?f=26&t=1519 and thought, 'hey, I can fix that.' So, here we are. :> Also adjusts Phi's last name - in the comment for the listing - as I've seen it in-game, back to Viesti.
2019-03-01 14:00:58 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Unknown
a4317b1910 [5654] Makes this PR Compile
This one made me cry.
2019-02-23 12:30:16 -05:00
Spades
b7c90be1b0 Extended the expiration time 2019-02-23 11:49:19 -05:00
Heroman3003
0171fa3faa Cleanup of Tempest saddlebag code 2019-02-23 06:37:57 +10:00
Unknown
de18c9321f Fixes Spirit for AI Overhaul
- Also fixes an error with Phi's ring
2019-02-20 12:26:58 -05:00