Commit Graph

604 Commits

Author SHA1 Message Date
Sishen 47ee3a8a6d fuck 2019-08-28 23:56:08 -04:00
Ghommie 18b023b127 arg 2019-08-28 04:47:53 +02:00
Ghommie e25697dc14 rocket fix. 2019-08-28 03:37:35 +02:00
Tupinambis d43b4599ef I was bullied to reduce click delay. 2019-08-26 15:53:44 -05:00
Tupinambis 13638ed5d6 Reverts some changes I deemed unneccesary. Undoes a fuckup 2019-08-26 15:08:36 -05:00
Tupinambis a4fd2be7f7 Various Shotgun Nerfs. 2019-08-26 14:45:12 -05:00
Sishen 20f4e260e1 minigun ooga 2019-08-23 19:39:20 -04:00
kevinz000 3c59b43ff7 Update shotgun.dm 2019-08-21 06:39:18 -07:00
Poojawa 32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa 264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
kevinz000 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
kevinz000 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
kevinz000 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
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Chayse Ramsay 085251f5f7 update_icon 2019-07-30 04:35:54 +01:00
Trilbyspaceclone 969b928642 Update special.dm 2019-07-29 07:53:41 -04:00
TrilbySpaceClone 13936e97de emiting happyness 2019-07-24 14:40:59 -04:00
Chayse Ramsay 1c8768afe4 Redundant Redundancies made Redundant 2019-07-22 19:31:42 +01:00
Chayse Ramsay 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
Ghommie 7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
kevinz000 69f06444e6 smgs 2019-07-09 08:20:45 -07:00
Ghommie 9081b5b773 Revert "Fixes rocket launchers, buffing their accuracy etc."
This reverts commit 1c6156dd0e.
2019-07-08 07:17:49 +02:00
Ghommie 1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
Ghommie f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
kevinz000 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
Sishen 0a43036eae hugboxing slimepeople one thing at a time 2019-06-21 20:01:19 -04:00
Thalpy 1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
kevinz000 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
Fermi 9fcbac0323 Lil flavour. 2019-06-08 01:23:57 +01:00
Fermi 65b218d4c3 Spritework. 2019-06-08 00:31:14 +01:00
Ghommie 7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000 0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea
Adds improvised 7.62 rifle
2019-06-05 11:31:10 -07:00
Fermi 0fa445c153 Fixes and test. 2019-06-02 03:24:01 +01:00
Fermi 3cf3268c76 New non-harmful medicinal darts. 2019-06-01 22:52:03 +01:00
Ghommie 85ab988842 0, null, and "", all fulfill the ! operator. 2019-05-30 20:09:19 +02:00
Trilbyspaceclone 1b48db693f Update shotgun.dm 2019-05-27 02:42:46 -04:00
Trilbyspaceclone f5d4135fe9 Update automatic.dm 2019-05-24 22:14:17 -04:00
Trilbyspaceclone 5b6f324993 Update shotgun.dm 2019-05-24 22:13:16 -04:00
Poojawa 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
deathride58 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
Trilbyspaceclone 150db880de Update laser.dm 2019-05-01 16:07:11 -04:00
Trilbyspaceclone fd251d3dd2 Update laser.dm 2019-05-01 15:15:29 -04:00
kevinz000 cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
2019-04-30 05:31:33 -07:00
Trilbyspaceclone aabba13648 Update shotgun.dm 2019-04-26 20:34:47 -04:00
Trilbyspaceclone b4bdc9bc1d Update laser.dm 2019-04-26 00:47:21 -04:00
kevinz000 0e863d7daf Update special.dm 2019-04-16 22:42:36 -07:00
kevinz000 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