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
kevinz000
fc5eeeac00
Update gun.dm
2020-02-15 12:14:51 -07:00
kevinz000
24b977f655
Merge branch 'master' into stuff
2020-02-15 11:45:25 -07:00
kevinz000
3865224e78
fine
2020-02-13 15:40:30 -07:00
Linzolle
790b7bf9cc
sanity check
2020-02-13 15:20:01 -06:00
Linzolle
d22631700c
update the fucking craft component because artur forgot to
2020-02-13 12:59:56 -06:00
kevinz000
a8a071851a
s
2020-02-13 00:32:26 -07:00
Linzolle
4622f66162
for real this time
2020-02-09 19:45:22 -06:00
Ghom
2a0ba12896
Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
...
gun qdel fix
2020-02-09 02:53:38 +01:00
kevinz000
7c16830e91
ok
2020-02-07 23:31:38 -07:00
kevinz000
4f2acb6298
Update gun.dm
2020-02-07 00:08:19 -07:00
kevinz000
8556a6188f
Merge remote-tracking branch 'citadel/master' into small_guncode_refactor
2020-02-04 03:47:01 -07:00
kevinz000
54d70cd9fe
Update gun.dm
2020-02-03 18:33:24 -07:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
kevinz000
fe5a83ea52
Update gun.dm
2020-01-31 01:22:53 -07:00
kevinz000
9df12f94d4
Merge branch 'master' into one_last_taser_attempt
2020-01-29 16:27:58 -07:00
kevinz000
d89b8d95cf
BRAINLETMOMENT
2020-01-27 22:44:51 -07:00
kevinz000
3ce1fe2585
changes
2020-01-27 22:26:43 -07:00
kevinz000
9d047f07f8
separate this a bit
2020-01-27 21:08:47 -07:00
kevinz000
7ae43a2249
fix
2020-01-27 17:51:59 -07:00
kevinz000
0eb13d8f23
refactors guns a bit
2020-01-27 17:39:49 -07:00
kevinz000
4883b36576
compile
2020-01-27 02:55:32 -07:00
kevinz000
b0c2e4cbdd
Revert "shotgun pointblanking people actually throws them"
2020-01-15 01:13:26 -07:00
Hatterhat
318a6812c3
manually copied tgstation#47443
2019-12-31 21:38:11 -06:00
Ghommie
91ffa11bc9
Nerfs circuit pneumatic cannons and guns with extra sanity checks.
2019-12-04 01:07:36 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
kevinz000
d1f6483687
Merge pull request #9704 from Ghommie/Ghommie-cit314
...
Minor ninja tweaks and stealth nerf.
2019-11-10 11:31:25 -07:00
Ghommie
286b78c84c
Minor ninja tweaks and stealth nerf.
2019-11-03 17:14:55 +01:00
Ghommie
b653595702
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-10-31 22:40:11 +01:00
BlackMajor
6a7a121d56
Merge pull request #8856 from Citadel-Station-13/magrifles_again
...
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
2019-10-28 16:47:02 +13:00
kevinz000
c6c2a703e5
Merge remote-tracking branch 'origin/master' into magrifles_again
2019-10-21 00:47:03 -07:00
Ghommie
fe71e2984c
Fixing sniper rifles scope datum action oddities.
2019-10-19 16:40:01 +02:00
Ghommie
e991328087
progress
2019-10-19 15:02:56 +02: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
kevinz000
a2d52c0ed9
HERE WE GO AGAIN.
2019-07-09 07:55:44 -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
Ghommie
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
nik707
a89ab006c1
Adds new and immersive sound for combat
...
Dink!
2019-03-05 15:03:08 -06: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
621b0675e9
Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights
2018-11-16 21:12:07 -05:00
Poojawa
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
CitadelStationBot
773ba43974
[MIRROR] Fixes null bullets from being fired after they're deleted ( #7102 )
...
* Fixes null bullets from being fired after they're deleted (#38437 )
* Adds handle_atom_del check to if deleted bullets are equal to ammo type and chambered round.
* works for me
* Update _box_magazine.dm
* Fixes null bullets from being fired after they're deleted
2018-06-15 02:48:48 -07:00
deathride58
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Dax Dupont
74932ddce0
Gun overlays 2: Electric boogaloo. ( #38003 )
...
* Reduces selfcharge gun processing/icon work
* More efficient gun overlays, adds old_ratio var
* oh my god it was calling the egun's update_icon?
* percent proc
* Attachment overlay overhaul
* Cut overlays in egun update
* ebow 1000% better overlay management
* Update gun.dm
* Pointless check
* Giving KA and children consistent icon behavior
* Update kinetic_accelerator.dm
* Fixed
* ..() readded
* ..() readded
* ..() readded
* Antur didnt catch this one heck
* Because confusing vars are apparently more maintainable
* Gun overlays 2: Electric boogaloo
* another one
* Chameleon guns are removed
* tentacles everywhere
2018-05-27 11:41:14 -05:00
deathride58
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
oranges
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
