Commit Graph

642 Commits

Author SHA1 Message Date
kevinz000
317dc309a0 Merge pull request #8024 from deathride58/bloodybloodbloodblood
Atomizes the med rework's blood effect changes (most things that make a blood effect will now make you actually lose blood) and makes the blood reagent act more like you'd expect
2019-02-27 16:03:56 -08:00
Ghom
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
deathride58
19035c4450 fixes zooming guns being plausible even if you aren't holding the gun in any of your hands (#8012) 2019-02-22 06:01:48 -08:00
deathride58
a386632c8a travis is a travesty 2019-02-20 04:04:23 -05:00
deathride58
20740bda39 a bloody fun time - atomizes the med rework's blood effect changes and makes the blood reagent act more like you'd expect 2019-02-20 00:38:23 -05:00
deathride58
7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
deathride58
7b00195c0c reduces stamloss for shotgun pumping from 5 to 2 (#7973) 2019-02-05 18:15:31 -08:00
BlackMajor
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
deathride58
a877e796d4 Merge pull request #7890 from Ragolution/endrapen
Suicide Messages, Combat Messages, Uniforms Recovered
2019-01-14 21:39:02 -05:00
Ragolution
e390f37998 Adjusts wording for grammar on cryo shotgun dart
Travis is fucking bullying me.
2019-01-04 07:36:32 -05:00
Ragolution
5f019696bd Spellcheck 2 Electric Boogaloo
statis

Misspelling of status.
2019-01-04 06:52:57 -05:00
deathride58
2d01ac3604 Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4
fixes neurotoxin properly
2019-01-03 07:47:34 -05:00
Trilbyspaceclone
21f111b5e0 [Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873)
* Fixing updater

* Adds the gunthingy

* makes the bullet

* Update mecha_designs.dm

* Update all_nodes.dm

* Fixes stam harm
2019-01-03 04:38:10 -08:00
Trilbyspaceclone
1f1c5b3710 [Ready] Adds in a scatter shot Bulldog drum! (#7863)
* Fixing updater

* adds the ammo

* Update uplink_items.dm

* Update shotgun.dm

* Update uplink_items.dm
2018-12-31 03:11:44 -08:00
kevinz000
5c3eb5b00e Update neurotoxin.dm 2018-12-30 22:22:45 -08:00
kevinz000
96b4171044 Update neurotoxin.dm 2018-12-24 01:52:08 -08:00
Ignari-Coldstorm
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
kevinz000
6ba2d56435 Update neurotoxin.dm 2018-12-08 04:14:36 -08:00
deathride58
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
Ignari_Coldstorm
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
kevinz000
79b4d5f663 Update beam_rifle.dm 2018-11-19 20:24:21 -08:00
nik707
dbe0d00cc0 Merge pull request #7728 from deathride58/drowsyebows
Buffs ebows by making them deal 50 drowsiness
2018-11-19 18:05:40 -06:00
deathride58
621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
deathride58
f385751c4a Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723)
* Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes

* Im drunk ignore me
2018-11-16 14:46:54 -08:00
deathride58
7801829908 Makes ebows induce drowsiness 2018-11-16 07:05:46 -05:00
kevinz000
5cde0d0401 Update beam_rifle.dm 2018-11-09 19:02:04 -08:00
deathride58
dbd11b75d1 makes portal guns require firing pins (#7465) 2018-10-21 00:34:35 -07:00
Poojawa
12a9989a7c runtime fixes 2018-09-22 04:06:06 -05:00
Poojawa
720b25c6f5 floor fixes and gun memes 2018-09-22 03:50:37 -05:00
Poojawa
cb342866d6 a few last minute changes from TG
also changes His Grace from 25 to 10 requirments
2018-09-18 23:12:29 -05:00
Poojawa
99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
7650bac441 Upstream bugfix mirror spree (#7541)
* tgstation/tgstation#40061 - Fixes mobs getting stuck at min/max body temperature

* tgstation/tgstation#40043 - fixes beam rifles opening lockers

* tgstation/tgstation#40041 - Pictures of asses are properly sized now

* tgstation/tgstation#40084 - fixes lastattacker not including unarmed attacks

* tgstation/tgstation#39968 - Fixes plastic golems ventcrawling with items in pockets

* tgstation/tgstation#39885 - Fix overcharging energy guns crashing the server
2018-09-07 07:25:42 -07:00
deathride58
6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
kevinz000
0e0928df26 Merge branch 'master' into fusion_2 2018-09-03 11:17:45 -07:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
kevinz000
2bf5e6af58 Initial Commit 2018-09-03 10:35:47 -07:00
deathride58
69e1cb5aea nerfs disablers, buffs tasers (#7507) 2018-08-28 02:41:01 -07:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
438daa7acf Merge pull request #7411 from Citadel-Station-13/kevinz000-patch-3
Adds admin variable for atmospherics linking on portal guns
2018-08-04 00:21:44 -04:00
kevinz000
9325319da1 Update special.dm 2018-07-26 16:44:08 -07:00
kevinz000
5ccda57266 Update wormhole.dm 2018-07-24 01:06:37 -07:00
kevinz000
e29016b257 Update wormhole.dm 2018-07-21 02:17:54 -07:00
kevinz000
6e03770b93 Wormhole Update 2018-07-21 01:07:21 -07:00
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
deathride58
914967f081 Merge pull request #7356 from Trilbyspaceclone/WT-550
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
2018-07-10 02:03:08 -04:00
TrilbySpaceClone
ffc5c6935a Lets see If I did this correct this time! 2018-07-06 18:01:29 -04:00
TrilbySpaceClone
71c259b0c4 MoModularized, plz don't yell at me 2018-07-06 17:33:07 -04:00