Commit Graph

201 Commits

Author SHA1 Message Date
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
Arokha Sieyes
1ba87bea73 Merge polaris sync 2017-03-28 12:24:46 -04:00
JoanRisu
284460593c Resolves #1129. Adds custom_onmob_vr.dmi for onmob sprites for glasses, masks, and shoes. 2017-03-27 01:54:55 -07:00
JoanRisu
8d6377f4b4 adds vehicles to the cargo lists and makes changes to a few things. 2017-03-26 22:39:54 -07:00
killer653
761ff80f55 Adds KiwiDaNinja's custom item
Solves #1200
2017-03-20 01:45:52 -04:00
Arokha Sieyes
35d8c27b7c AR-K HUD Band
Because I'm jealous of Scree's custom HUD.
2017-03-19 01:06:31 -04:00
Arokha Sieyes
2dbccc6016 Fix ported translator paths and map entries 2017-03-18 01:17:00 -04:00
Screemonster
4ec6342e6a adds serkii's dress and a meson engineering HUD 2017-03-16 07:58:07 +00:00
Arokha Sieyes
55f17ded47 Merge pull request #1158 from JoanRisu/Fluff_Items_worshop
Fluff items workshop
2017-03-11 01:22:25 -05:00
Arokha Sieyes
2777ce58c8 Merge pull request #1159 from Yoshax/moarmining
Belt mining slight expansion
2017-03-11 01:22:06 -05:00
Yoshax
056d31a4cd Fixes a warning 2017-03-11 02:40:29 +00:00
JoanRisu
388bf0a537 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-10 15:13:01 -08:00
Arokha Sieyes
cb02263050 Merge pull request #1157 from Cameron653/master
Adds Vorrarkul's chococoat
2017-03-10 18:07:44 -05:00
Arokha Sieyes
0bbc12893c Merge pull request #1154 from VOREStation/aro-translator
Translator Improvement
2017-03-10 18:05:27 -05:00
Cameron653
7cc2010e49 Fixes a mistake 2017-03-10 17:25:35 -05:00
JoanRisu
337eb55cc4 Adds missilerack and open rover icons in. 2017-03-10 14:22:40 -08:00
killer653
a115d8dc2b Adds Vorrarkul's chococoat
Resolves #1102
2017-03-10 17:20:50 -05:00
Arokha Sieyes
4902e94c0b Merge pull request #1145 from JoanRisu/Fluff_Items_worshop
Conflict Resolver: Revenge of the Merge
2017-03-10 09:49:31 -05:00
JoanRisu
11b8810c34 Minor edit to correct plague doctor mask for octavious 2017-03-10 00:21:50 -08:00
Arokha Sieyes
25d6a3effb Translator Improvement
Lets you pick a language to translate INTO from your known languages. If you then hand it off to someone who doesn't speak that, they won't be able to read the text on the screen. They can just reboot it and pick their own language.

Mostly for fluff, for people who would rather see things translated into their more-well-known language that they speak better.
2017-03-10 00:40:31 -05:00
Arokha Sieyes
0fd54d1449 Handheld Translator
Turn it on, keep it in hand or pocket, and it'll translate languages for you (not signlanguage...).
It doesn't bother displaying languages that you speak. I assume your character doesn't look down at the screen if they understood what was said (it's mostly just to prevent spam when only 1 in 4 people standing around talking is speaking another language).

There's one on a desk in the security locker room and one in the medical breakroom. I figure these two departments have the highest need of translations. R&D can make more. The design is fairly cheap.
2017-03-09 18:00:26 -05:00
JoanRisu
2192a3b022 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-09 01:17:56 -08:00
JoanRisu
c1d35bc97d Step one we need to talk, you say conflicting files kinda suck. 2017-03-09 01:13:49 -08:00