Commit Graph

1073 Commits

Author SHA1 Message Date
Arokha Sieyes
bd39011ab4 NSFW Gun
Also fixes slidey walls at centcom, gives the ERT commander a NSFW with stun, xray, lethal, and net. Gives deathsquad a full NSFW kit (including 'final option' ammo), replaces my own fluff Hunter with a NSFW with stun and net (so, same as the hunter, but that sprite is so badass I can't help it), and fixes a typo on my permit while I'm on there (KIN isn't a thing, KHI is).
2017-06-17 15:44:52 -04:00
Arokha Sieyes
6e5c63d3a5 Changes protector sprite, adds flashlight 2017-06-13 21:39:46 -04:00
Arokha Sieyes
557d685025 Individual-files some more complicated guns and ammo
We should probably do this from now on. Keeps things organized.
2017-06-13 15:07:19 -04:00
Arokha Sieyes
f98432a113 Adds 3 new guns
* KHI-98a 'Protector'
* MPA6 'Sickshot'
* PML9 'Pummeler'

The Protector is an energy gun that can't be fired on lethal on code green, so it's considered safe for sec to carry regularly, and has a slightly enhanced stun over tasers and normal eguns. It also features a DNA lock that allows one to secure the gun to themselves. An emag can disable both the security level lock and clear DNA.

The Sickshot is a stun weapon in handheld form, that induces nausea and vomiting. It has a chance to make predators vomit out prey (regardless of belly) and tends to cause confusion and nausea. It does cause slight burns from the hypersonic frequency sound it uses, but nothing serious or potentially lethal.

The Pummeler is a 'bass cannon' essentially that fires a huge sound wave, tossing the target away from you. It may or may not knock them down, depending on your luck, but it will definitely push them away, and potentially over a railing or wherever you wanted to put them.
2017-06-13 15:06:43 -04:00
Kelshark
b64bfa41e6 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-06-12 12:39:39 -04:00
Kelshark
a17b2437e8 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	vorestation.dme
2017-06-12 12:39:07 -04:00
izac112
a5bc6a396e Merge branch 'master' of https://github.com/Repede/YawnWiderStation into Izac 2017-06-12 17:29:48 +02:00
izac112
d12cd68f77 Fluff fix and changed one thing that triggers me
Signed-off-by: izac112 <izac10@live.com>
2017-06-12 17:29:20 +02:00
Arokha Sieyes
599474a062 Makes people's fluff IDs get account numbers
Takes it from the user's mindddd.
2017-06-12 10:07:18 -04:00
Arokha Sieyes
da78624bc1 Merge pull request #1667 from SpoopyLizz/master
Added colored eggs and did some minor tweaks.
2017-06-11 14:40:31 -04:00
Arokha Sieyes
93888221b2 Merge pull request #1690 from VOREStation/polaris-sync-gc
tg Garbage Subsystem
2017-06-11 14:39:30 -04:00
InterroLouis
8cefd8f702 Update custom_guns_vr.dm 2017-06-11 11:45:00 -04:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
2017-06-10 22:44:03 -04:00
SpoopyLizz
e3db32fd60 hopefully fixed the problem this time 2017-06-11 02:51:29 +02:00
Yoshax
73fda854cf Add's Epic_Charger's custom taur winter snow suit 2017-06-10 18:18:20 +01:00
SpoopyLizz
ac03b1075d Added colored eggs and did some minor tweaks. 2017-06-10 03:34:55 +02:00
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
Kelshark
641246155c Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
2017-06-01 17:25:39 -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
Kelshark
15b8fcbe6d Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/machinery/computer/communications.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	config/custom_items.txt
#	icons/misc/title_vr.dmi
#	icons/mob/human_races/r_def_xenochimera.dmi
#	maps/RandomZLevels/fileList.txt
#	vorestation.dme
2017-05-24 13:46:58 -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
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
Kelshark
a959377066 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-05-17 11:13:39 -04:00
izac112
1defb1fa55 Merge pull request #51 from Repede/Izac
Izac i dont like tortis git
2017-05-17 17:12:09 +02:00
izac112
c2d9bc67b6 fuck you tortis git 2017-05-17 17:10:47 +02:00