27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
f59abbf073
Merge pull request #8942 from jakeramsay007/WardenShotgun
...
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
2019-08-03 00:48:59 -07:00
b52462de0d
Merge pull request #8958 from Trilbyspaceclone/emitter_gun
...
Makes a new traitor Emitter gun for Engi memes
2019-08-01 23:29:10 -07:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
085251f5f7
update_icon
2019-07-30 04:35:54 +01:00
969b928642
Update special.dm
2019-07-29 07:53:41 -04:00
13936e97de
emiting happyness
2019-07-24 14:40:59 -04:00
1c8768afe4
Redundant Redundancies made Redundant
2019-07-22 19:31:42 +01:00
ede61d8cb2
Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded.
2019-07-22 00:55:41 +01:00
7065a86841
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
2019-07-19 22:02:22 +02:00
9081b5b773
Revert "Fixes rocket launchers, buffing their accuracy etc."
...
This reverts commit 1c6156dd0e
2019-07-08 07:17:49 +02:00
1c6156dd0e
Fixes rocket launchers, buffing their accuracy etc.
2019-07-08 06:56:20 +02:00
f39a5d2f6a
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
2019-06-30 21:53:33 +02:00
f7dcedce5f
Merge pull request #8715 from Sishen1542/toxinmanbad
...
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
2019-06-23 06:57:09 -07:00
0a43036eae
hugboxing slimepeople one thing at a time
2019-06-21 20:01:19 -04:00
1cc0724519
Merge branch 'master' into Dwarf
2019-06-17 12:09:55 +01:00
2f2885f1d6
Merge pull request #8558 from Ghommie/Ghommie-cit35
...
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
9fcbac0323
Lil flavour.
2019-06-08 01:23:57 +01:00
65b218d4c3
Spritework.
2019-06-08 00:31:14 +01:00
7aac9e6280
Updates reagents a bit.
2019-06-07 06:27:04 +02:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
0d97361dea
Merge pull request #8430 from Trilbyspaceclone/bad_idea
...
Adds improvised 7.62 rifle
2019-06-05 11:31:10 -07:00
0fa445c153
Fixes and test.
2019-06-02 03:24:01 +01:00
3cf3268c76
New non-harmful medicinal darts.
2019-06-01 22:52:03 +01:00
85ab988842
0, null, and "", all fulfill the ! operator.
2019-05-30 20:09:19 +02:00
1b48db693f
Update shotgun.dm
2019-05-27 02:42:46 -04:00
f5d4135fe9
Update automatic.dm
2019-05-24 22:14:17 -04:00
5b6f324993
Update shotgun.dm
2019-05-24 22:13:16 -04:00
f3116baa08
Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37
...
Removes firing pins from preprinted gravity guns
2019-05-21 08:04:26 -04:00
150db880de
Update laser.dm
2019-05-01 16:07:11 -04:00
fd251d3dd2
Update laser.dm
2019-05-01 15:15:29 -04:00
cbc0607086
Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
...
Readds Laser carbines.
2019-04-30 05:31:33 -07:00
aabba13648
Update shotgun.dm
2019-04-26 20:34:47 -04:00
b4bdc9bc1d
Update laser.dm
2019-04-26 00:47:21 -04:00
0e863d7daf
Update special.dm
2019-04-16 22:42:36 -07:00
d681b30df5
Merge pull request #8102 from Trilbyspaceclone/semi-auto
...
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
2019-03-10 13:44:57 -07:00
5aa5f1ed56
SMG
2019-03-09 20:29:19 -05:00
8f9542bc43
Update automatic.dm
2019-03-09 20:05:07 -05:00
a89ab006c1
Adds new and immersive sound for combat
...
Dink!
2019-03-05 15:03:08 -06:00
e9e9075800
unironically applying Kev's suggestion
2019-03-03 01:09:16 +01:00
704d7403ac
Tweaking some cyborg mounted energy guns. ( #8037 )
...
* You get yourself a bottle and say, "I don't love anything anymore."
* the sunset.
* I'm nuclear gun, I'm wild.
2019-02-27 16:02:33 -08:00
7b00195c0c
reduces stamloss for shotgun pumping from 5 to 2 ( #7973 )
2019-02-05 18:15:31 -08:00
454f672e34
Why isn't the compact shotgun compact
...
-Changes the wardens compact combat shotgun to fit in backpacks.
No really, a sawed off riot shotgun fits in a backpack and holds more ammo. Any Warden worth their salt just swaps shotguns, you'd think a "Compact" shotgun would be able to fit much the same considering the lower ammo count.
2019-01-16 19:54:58 +13:00
9c16527cd4
Mining Vendor and PPKA changes! ( #7817 )
...
* Mining Vendor and PPKA changes!
Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.
* Update machine_vending.dm
2018-12-16 03:56:21 -08:00
6c5694ce0c
Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA
...
Adds a new PKA to the mining Vendor
2018-12-03 11:20:37 -05:00
55517ae329
Adds a new PKA to the mining Vendor
...
Miners are always going and saying that they amass so many points while mining, yet nothing is worthwhile enough to buy with said points so they sit there wasted usually. This adds a new premium Kinetic Accelerator with stronger base stats, meanwhile it costs 8K mining points. Will later be adding premium edition of Kinetic crusher. Ideal goal is to encourage miners to mine enough ore for station to get this gear before they go out to hunt for real.
2018-11-30 20:18:49 -06:00
79b4d5f663
Update beam_rifle.dm
2018-11-19 20:24:21 -08:00
5cde0d0401
Update beam_rifle.dm
2018-11-09 19:02:04 -08:00
dbd11b75d1
makes portal guns require firing pins ( #7465 )
2018-10-21 00:34:35 -07:00
720b25c6f5
floor fixes and gun memes
2018-09-22 03:50:37 -05:00
kevinz000