Commit Graph

2511 Commits

Author SHA1 Message Date
Arokha Sieyes 0823a6ac1b Merge pull request #1643 from Yoshax/woahsecretfeaturesmakemeagod
Removes the snowflake human defined verbs from the majority of the reagent implants
2017-06-09 00:14:44 -04:00
Yoshax f154683662 Removes the snowflake human defined verbs from the majority of the reagent implants 2017-06-08 21:52:56 +01:00
Layla Crosse/Occula Drenn f2847f5023 Adding Seiga's Gazer whitelist! 2017-06-07 23:15:52 -04:00
Layla Crosse/Occula Drenn 7dc278a601 Adding a double kitsune tail!
Why not!
2017-06-07 23:07:02 -04:00
Layla Crosse/Occula Drenn a4d426e91d Adding Harpywings!
FINALLY
2017-06-07 20:32:57 -04:00
Verkister 797664ff1f Merge branch 'master' of https://github.com/Verkister/VOREStation 2017-06-07 12:12:16 +03:00
Cameron653 5b9d37ffec Fluff item - Ruda Lizden (Hisstective's Badge) (#1632)
* Adds Roiz's items

* Adds Item
2017-06-06 21:57:51 -04:00
Arokha Sieyes f7c3ab5a8c Merge pull request #1626 from VOREStation/aro-nifsoft
Nanite Implant Framework
2017-06-06 21:55:05 -04:00
Arokha Sieyes 379e1ad12d Roiz Egg Tweak
Stahp giving me compile warnings
2017-06-06 20:18:57 -04:00
Arokha Sieyes 08e7703e4f Finishing Up NIFs
Squashed commit:

[4b18ca1] Finishing up NIFs

[e4adb4a] Tons more NIF work

All the implants are done!
2017-06-06 19:34:41 -04:00
Arokha Sieyes 33e7de6295 Merge pull request #1614 from SpoopyLizz/master
Egg laying implant, yo!
2017-06-06 09:38:52 -04:00
Verkister 53069d1dcb Adds fluff science goggles that actually do nothing. 2017-06-06 12:38:32 +03:00
Arokha Sieyes 50accd426c Initial NIF Commit 2017-06-06 01:00:42 -04:00
SpoopyLizz 13c431a849 Changes as requested by Aronai fulfilled.
https://github.com/VOREStation/VOREStation/pull/1614
2017-06-05 00:47:50 +02:00
Arokha Sieyes 1623f5fd21 Modify fluff gun to 10mm
Instead of mateba megarounds.
2017-06-04 12:46:12 -04:00
SpoopyLizz fc1bffdfb6 Egg laying implant, yo! 2017-06-03 15:59:45 +02:00
Leshana c4bdc4c027 Updated VOREStation specific files for the ammo path reorganization.
* Updated paths in dm files
* Updated references in all dmm files for tether, virgo, and randomz
2017-06-02 12:18:13 -04:00
Arokha Sieyes 4913464913 A Jacket To Match The Coat
And normal holster instead of leg holster. Because I can never decide what I want.
2017-05-30 15:50:23 -04:00
Layla Crosse/Occula Drenn 6d4e0695f9 Fixing Ariana's taurhalf 2017-05-30 00:37:03 -04:00
Layla Crosse/Occula Drenn 559c01b439 Ariana's Centipede Taurhalf. (#1585)
* Adds Ariana Centipede taur

* Add files via upload

* Adding Ariana's taurhalf.

UPLOADING THE RIGHT FILE THIS TIME.

* Adding Ariana's Centipede taur

Please.   Please I'm going insane.

* Adding Ariana's taurhalf

I want death.
2017-05-29 21:13:53 -04:00
Arokha Sieyes 5ccb939531 Merge pull request #1583 from VOREStation/aro-SPECIES
Custom Species Trait System
2017-05-29 17:49:45 -04:00
Arokha Sieyes 1c153f7063 Merge pull request #1582 from killer653/master
Gives Vorrakul a mouse plushie
2017-05-29 14:17:02 -04:00
killer653 9316d49972 Gives Vorrakul a mouse plushie
Resolves #1576
2017-05-29 13:20:31 -04:00
Arokha Sieyes 4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
killer653 d2fa930662 Returns one 2017-05-28 23:55:23 -04:00
killer653 a52bac9f1c Makes it so mice can't eat people.
http://i.imgur.com/Huc8Ikk.jpg
It was causing a lot of bugs
2017-05-28 18:48:20 -04:00
Arokha Sieyes c8eb369ed8 Merge pull request #1564 from VOREStation/polaris-merge-2017-05-26
Polaris Sync 2017 05 26
2017-05-26 19:27:06 -04:00
Leshana 8c8e04a0a0 Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo.
* Swapped our loot drops and guns to keep the damage of loot and guns the same.
* Edited the c762 magazine definition back to keep the same ammo count in each magazine type as before.

Conversion chart used:
==OLD==     max_ammo    ==NEW=      max_ammo
a556        10          s762        10
a556m       20          c762        (20)

s762        10          c556        20
c762        20          c556/ext    30
a762        50          a556        50
2017-05-26 17:54:04 -04:00
Yoshax f8c73635da Adds vorrarkul's custom item 2017-05-26 19:36:29 +01:00
Arokha Sieyes 70e03f2377 Merge pull request #1553 from VOREStation/sundry-runtimes2
Sundry runtimes 2
2017-05-25 16:39:39 -04:00
Yoshax cdc36ed4f2 Closes a span 2017-05-25 19:18:13 +01:00
Yoshax 3fb4ac2cdf Adds wah's custom item 2017-05-25 18:20:54 +01:00
Leshana 5b840b1591 Runtime in living_vr.dm,197: Cannot read null.prefs_vr 2017-05-23 21:04:27 -04:00
Jakksergal e113b6890b Applies ROT2 encyption to one letter. 2017-05-23 16:32:40 -07:00
Jakksergal 277bbbeb5a Adds a " 2017-05-23 16:14:55 -07:00
Jakksergal 23c9c988e6 Tail Sprite Additions.
Adds a winged varient of both avian tails.
Adds a wingless varient of the bee 'thorax'
2017-05-23 16:03:29 -07:00
Arokha Sieyes 92b8f93965 Non-fuzzy macro scaling attempt
Let's see how it goes!
2017-05-21 21:38:52 -04:00
Yoshax b8e454ea39 Custom item stuff 2017-05-21 23:36:11 +01:00
Yoshax e80541f74f Fixes an issue with a custom item 2017-05-21 20:34:06 +01:00
Arokha Sieyes 2cc7d2af15 Merge pull request #1498 from Cameron653/master
Fixes serdy's revolver gun sound
2017-05-21 00:36:31 -04:00
Arokha Sieyes d3d180f739 Merge pull request #1497 from VOREStation/aro-tether-wip
Various Tether Fixes
2017-05-21 00:35:52 -04:00
Cameron653 15104bb579 Fixes serdy's revolver gun sound
Gives it the correct fire sound
2017-05-20 22:32:12 -04:00
Arokha Sieyes 430895bf82 Fixup elevator cryo missing 2017-05-20 22:26:09 -04:00
Arokha Sieyes 3a856f5bad Merge pull request #1493 from VOREStation/aro-tether-wip
Tether Map
2017-05-20 17:19:32 -04:00
Spades 520719411c Merge pull request #1486 from Pancakesss/patch-2
Belle's Netgun & Reagent Implant
2017-05-20 16:08:22 -04:00
Pancakesss 3e37c22747 Update custom_items_vr.dm
Huff.
2017-05-20 15:32:37 -04:00
Yoshax c983574f6d Fixes some custom item stuff 2017-05-18 23:34:43 +01:00
Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Leshana f02d9d79b1 Fix mob zshadow update icons and other openspace fixes.
* Admin teleports will now update zshadow.
* update_icon() now syncs the zshadow.
* Objects being deleted will trigger open space update.
2017-05-15 20:45:22 -04:00
killer653 8100fd3635 Adds SilencedMP5A5's permit 2017-05-14 16:35:04 -04:00