Commit Graph

96 Commits

Author SHA1 Message Date
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
silicons
23443be90e Update pumpenergy.dm 2020-08-13 15:27:07 -07:00
kevinz000
19072abe37 compile 2020-05-08 23:01:05 -07:00
ZeroMan
f65dfc4994 actual two hit ko 2020-04-25 08:19:34 -04:00
ZeroMan
883b932a48 i will eliminate security 2020-04-23 22:28:50 -04:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
TrilbySpaceClone
2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00
Trilbyspaceclone
3948214380 Update handguns.dm 2020-04-02 09:18:37 -04:00
kevinz000
225d5a3c40 Nerfs HoS taser and warden stun pump action blaster (#11352)
* Update stun.dm

* Update pumpenergy.dm
2020-03-20 16:09:10 +01:00
Ghommie
2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
necromanceranne
e0df350579 PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals. 2020-03-10 23:21:59 +11:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghommie
1a0fba8a2a Something about consistency and magnetic rifles. 2020-02-16 18:37:51 +01:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
kevinz000
8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000
0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
TrilbySpaceClone
92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05:00
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
Ghommie
b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Trilbyspaceclone
0b63e79098 Merge branch 'master' into glassware 2019-12-21 15:41:45 -05:00
kevinz000
97f678b542 Merge pull request #10058 from Ghommie/Ghommie-cit432
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
2019-12-20 23:20:49 -07:00
Trilbyspaceclone
ddd3676903 Merge branch 'master' into glassware 2019-12-17 15:18:30 -05:00
Ghommie
3fcb7808fd args 2019-12-13 02:30:17 +01:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
TrilbySpaceClone
67d3d19cb9 correctiosn
and movement
2019-12-07 13:43:34 -05:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Ghommie
a944ea9db1 considering the gun holds 2 rounds at a time and we have odd amounts in the box, players may become upset about it in the future. 2019-12-06 05:07:34 +01:00
Ghommie
0e3774d73f Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance. 2019-12-06 04:47:33 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
kappa-sama
c9c7d3e64e begone 2019-11-13 16:46:13 -05:00
Ghommie
3a9e4c1f13 Unmodularizing 2/3 of the sounds folder. 2019-11-06 23:11:15 +01:00
kevinz000
31f9ed9665 fixes 2019-10-24 15:31:45 -07:00
kevinz000
f96e1bbe33 lmao 2019-10-22 01:59:45 -07:00
kevinz000
95b81b5938 fix 2019-10-21 00:55:15 -07:00
kevinz000
c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
Ghommie
7e99dd205a Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites. 2019-07-19 21:54:48 +02:00
kevinz000
28072a31dc Update magweapon.dm 2019-07-13 20:03:39 -07:00
kevinz000
69f06444e6 smgs 2019-07-09 08:20:45 -07:00
kevinz000
a2d52c0ed9 HERE WE GO AGAIN. 2019-07-09 07:55:44 -07:00
Trilbyspaceclone
3bf667ba36 Update magweapon_energy.dm 2019-05-22 12:42:28 -04:00
Trilbyspaceclone
005647d4f6 Update magweapon_energy.dm 2019-05-22 12:12:06 -04:00
kevinz000
90c3e4b776 Merge pull request #8322 from Trilbyspaceclone/patch-117
Buffs mag-gun recharges speed
2019-05-11 22:18:29 -07:00
Trilbyspaceclone
dc4aa42525 Update magweapon_energy.dm 2019-05-05 06:35:32 -04:00