Commit Graph

323 Commits

Author SHA1 Message Date
Arokha Sieyes
4c3993df65 Merge pull request #1665 from VOREStation/aro-bshtweaks
Couple more BSH Tweaks
2017-06-09 20:06:11 -04:00
Arokha Sieyes
f88ac10362 Couple more BSH Tweaks
No more harpooning into walls to walk into areas you can't see because that's stupid. You can't harpoon turfs with dense objects on them.
2017-06-09 19:52:18 -04:00
Arokha Sieyes
a22e9e70aa Remove a bunch of my fluff items
We're going to start limiting them to certain jobs and such. Too many people have too many mechanically superior-to-normal-stuff fluff items. So let this be an example that it's not some sorta thing we're doing to be mean.
2017-06-09 19:41:13 -04:00
Arokha Sieyes
4344c285a6 Merge pull request #1654 from Verkister/master
Longpup mobs! (plus an approved fluff item committed earlier)
2017-06-09 19:31:50 -04:00
Arokha Sieyes
78594376f1 Fix Bluespace Harpoon bug, Allow Teleport Jamming
The subspace jammers will jam portable teleporters (not the hand tele, for ~reasons~ (mostly to give it one good feature)). This should also fix an annoying bug where the bluespace harpoon fails to work for a long period of time.
2017-06-09 15:32:25 -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
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
379e1ad12d Roiz Egg Tweak
Stahp giving me compile warnings
2017-06-06 20:18:57 -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
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
killer653
9316d49972 Gives Vorrakul a mouse plushie
Resolves #1576
2017-05-29 13:20:31 -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
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
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
Cameron653
15104bb579 Fixes serdy's revolver gun sound
Gives it the correct fire sound
2017-05-20 22:32:12 -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
killer653
8100fd3635 Adds SilencedMP5A5's permit 2017-05-14 16:35:04 -04:00
killer653
fe767f44b5 Literally right after I submitted the PR 2017-05-11 15:36:09 -04:00
killer653
a535948e90 Serdy desc changes, serdy gun whitelist. 2017-05-11 15:30:52 -04:00
Arokha Sieyes
0a33bd5234 More tweaks to new head guns 2017-05-09 11:08:48 -04:00
Arokha Sieyes
7058806865 Ports 'head' guns from Eris, change Hunter sprite
RD: Bluespace Harpoon
HoS: Lamia handgun
HoP: Holdout E-Gun
A few other unused ones included in code.
2017-05-09 02:42:32 -04:00
Yoshax
40be042005 Add's Tempest's custom implant item (#1461)
* Implant stuff

Does more implant stuff

Does even more implant stuff

EVEN MOAR IMPLANT STUFF

Adds Tempest's custom fluff implant along with the generalized parent type

* Changes implant to just use its own reagents holder rather than a beaker, thanks Leshana

* Last commit maybe? Yay?
2017-05-03 22:09:07 -04:00
Arokha Sieyes
a3bf1b2492 Merge pull request #1457 from Yoshax/permitguns
Adds Aerowing and Table's custom item/gun stuff
2017-05-03 22:08:26 -04:00
JoanRisu
88e5fe0ead Resolves #1188 and #794 (#1427)
* resolves  #1188 and #794

* Moves custom taur armor stuff to the fluff items file. Adds comments to items for organizational purposes.

* Fixes

* Additional fixins

* Thanks Travis
2017-05-03 22:07:38 -04:00
Yoshax
c939cf1842 Adds Aerowing and Table's custom item/gun stuff 2017-05-01 14:26:14 +01:00
SeigaSeiga
0f77583881 Adds the cyborg visor as a fluff item, a child of regular sunglasses. Adds Seiga:Alfonso to custom_items.txt. 2017-04-28 23:06:20 +01:00
OrbisAnima
3efabaf2ab Added 3 new crates to cargo:
Recreation: - Recreational Restraints, all the kind of stuff you might need to restrain someone but still showing you care, whip included.
Science: - Dangerous Predator Crate, contains a random common predator for science analisys, a system that might come in the future!
(Contraband) Extremely Dangerous Predator Crate, Contains a random yet quite mortal predator, for analiisys only by the bravest or fooliest people in the crew.
2017-04-20 20:48:27 -03:00
Arokha Sieyes
8c7fad0fa9 Updates custom items to reflect permit status 2017-04-05 00:28:09 -04:00
Arokha Sieyes
58cbfefd78 Updates permits
Two permit updates
2017-04-04 22:19:15 -04:00
Arokha Sieyes
32455d3abf Slight oversight on transloc failure chance
Needs to have at least 2 beacons, since otherwise this will pick from an empty list.
2017-04-03 02:47:45 -04:00
Arokha Sieyes
9099b93ae8 Replace CD's hand tele with Translocator
Because nobody wants to be randomly spaced for using a tool given to you. Also rebalances translocataor slightly. 5% failure chance, but only to send you to another beacon, not to space you, unless of course you throw one of the beacons into space, so don't do that. Also requires recharges now and has a weapon device cell. Three uses per charge.
2017-04-03 02:40:15 -04:00
Arokha Sieyes
a06a1af3c2 Change my flash pistol to Hunter 2017-04-02 19:26:39 -04:00
Arokha Sieyes
a28c9eacb2 Drop some custom items 2017-03-29 23:40:02 -04:00
Arokha Sieyes
e38701ddb1 leg holster 2017-03-29 23:37:19 -04:00
killer653
a58957db4d BatterBatter!
Duplication of #1259
Since another PR prevented #1259 from being merged, I went ahead and
just copied and pasted it for Dhael
2017-03-28 19:38:55 -04:00
Arokha Sieyes
8df21e989c Merge pull request #1264 from VOREStation/aro-syncshuttles
Polaris Sync
2017-03-28 13:19:32 -04:00