cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,255 Commits 8 Branches 26 Tags
94e6cc402bbdfcecb4e855594bf3c19c2978f853
Commit Graph

501 Commits

Author SHA1 Message Date
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
Heroman3003
b1c142eff0 Makes mlembulance slightly less quiet 2019-02-20 07:37:43 +10:00
TheFurryFeline
7d3f5b8627 Vakashi's Permit 
Adds Vakashi's permit as per https://forum.vore-station.net/viewtopic.php?f=27&t=1447
 2019-02-08 19:46:39 -05:00
Heroman3003
239a222a7f Improved Tempest ambulance sprites to better represent ambulance. 2019-02-05 06:25:31 +10:00
Heroman3003
f88452d2c9 Tempest's saddlebags now double as ambulance siren 2019-02-04 17:58:16 +10:00
Poojawa
f05675e269 Resolves compile errors 2019-02-02 04:33:13 -06:00
Silver
fcc1bf5b06 Adds Koyo's Fluff Item Box 
Adds Koyo's Fluff Item Box, approved at https://forum.vore-station.net/viewtopic.php?f=27&t=1502
 2019-02-01 21:39:18 -06:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Mewchild
7477c696dc Updates Fluff Item 2018-12-14 13:21:49 -06:00
Screemonster
10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Spades
4a27ffb35a Merge pull request #4515 from pontifexminimus2/dragor-HEYLOOKTHISMORONFORGOTHOWTODOSOURCETREEIBLAMEYOUARONAIFORMAKINGMEJUMPTHROUGHTHESEHOOPS 
Renames guns with proper names for a more generic name and edits their desc.
 2018-12-04 20:22:02 -05:00
Spades
822a9eff0e Merge pull request #4500 from lm40/master 
Adds Kenzie's hypospray
 2018-12-01 12:29:53 -05:00
Spades
0468b18e7a Merge pull request #4484 from VOREStation/permits-updates 
Updates permits, adds Ace's pistol
 2018-11-26 09:03:38 -05:00
Spades
c8b50f7a67 Merge pull request #4475 from Novacat/nova-weapons 
Weapons Tweaks and Sprites
 2018-11-26 09:02:55 -05:00
Spades
a542e23e4e dragor no 2018-11-25 20:32:40 -05:00
Unknown
19efdc84dc Improved Holdout Description 2018-11-25 17:33:04 -05:00
pontifexminimus2
5913203c0f Due to request of Ace. 2018-11-25 17:22:35 +01:00
pontifexminimus2
4c46defd4f Renaming Protector too. 2018-11-25 16:50:24 +01:00
pontifexminimus2
784e48b895 Holy shit I hate this. 2018-11-25 16:45:37 +01:00
lm40
d11c036733 fixed icon 2018-11-12 20:02:40 -05:00
lm40
79f92e4f20 added kenzie's hypospray 2018-11-12 19:33:34 -05:00
Spades
0f2a17b3bc Fixes error, also slightly alphabetizes a file 
custom_boxes_vr.dm
 2018-11-09 20:16:30 -05:00
Spades
129a289052 Updates permits, adds Ace's pistol 
- Fixed some permit stuff.
- Removed expired permits and associated items.
- Added Ace's pistol plus a spare mag.
- Locked items to brig access, covering warden, HoS, and Captain, but
not roles like HoP. I think.
 2018-11-09 20:06:01 -05:00
Unknown
97c5771625 8 Shots Phaser, 4 shots holdout 
- Also halves power usage for stun options on both the martin and the holdout
 2018-11-05 19:12:45 -05:00
Arokha Sieyes
d50e2d9deb Edit mapped in HoS armor 
It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that.
Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.
 2018-11-04 22:51:32 -05:00
Unknown
b974aa763a Renames normal to lethal on phasers 2018-11-02 15:59:13 -04:00