hornygranny
22e96d3377
Merge pull request #7277 from pudl/chemfix
...
replaces all instances of pacid with facid
2015-01-22 17:06:46 -08:00
Steelpoint
399524dd36
MoreMoreRefinements
2015-01-23 03:06:12 +08:00
Swag McYolosteinen
b44956df86
Merge pull request #7191 from paprka/ebowfix
...
fixes ebow and KA breaking once emp'd
2015-01-22 18:04:08 +01:00
Steelpoint
e63c805494
FixMissingIonGunFiringPin+LoyaltyPinsForPulseGuns
2015-01-22 16:47:01 +08:00
Firecage
72af5ffb8f
Did what HG said to do with Protosmg firing pin
2015-01-22 08:08:14 +02:00
pudl
08f8bb3ce8
replaces all instances of pacid with facid
2015-01-21 20:17:23 -06:00
Firecage
d18511eb72
This removes the firing pin from the Prototype SMG, and adds the standard firing pin to its children where they need it.
2015-01-21 23:33:49 +02:00
Steelpoint
a5c1faafb6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1
2015-01-22 03:24:54 +08:00
Cheridan
793243763d
Merge pull request #7185 from paprka/inhandrefactor
...
Inhand refactor
2015-01-20 22:16:06 -06:00
Cheridan
29af018796
Some fixes
...
-Fixes magic wands having electronic firing pins, now have FANCY CRYSTAL SHARDS
-Fixes grammer issue.
-Fixes code not compiling due to outdated proc
2015-01-20 21:41:36 -06:00
Swag McYolosteinen
63cb7dad4a
Merge pull request #7145 from paprka/gunsicons
...
splits gun.dmi up into multiple files
2015-01-20 17:56:41 +01:00
Delimusca
07927e759d
added ranged mimic
2015-01-19 11:44:34 -07:00
paprka
2566cf030e
fixes ebow and KA breaking once emp'd
2015-01-19 01:28:14 -08:00
paprka
f58096575c
refactors guns
2015-01-18 23:28:24 -08:00
paprka
88230fabfa
inhand refactor
2015-01-18 20:58:31 -08:00
Steelpoint
a097f86ac6
ERTBalancePassV1
2015-01-18 19:18:47 +08:00
paprka
a2fe7f0352
bloat killer 9000
2015-01-17 16:36:27 -08:00
paprka
1b6831dab1
splits gun.dmi up into multiple files
2015-01-17 15:34:30 -08:00
paprka
4a0aa0c0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/ammunition/ammo_casings.dm
code/modules/projectiles/ammunition/boxes.dm
icons/obj/ammo.dmi
icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
tkdrg
6bfebf2e48
Adds bolt-action rifle
...
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151
These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.
The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03:00
paprka
ab7d50c90e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/guns/projectile/launchers.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/research/designs/weapon_designs.dm
icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
Cheridan
63e09d0928
Merge pull request #6966 from Steelpoint/ERTv2
...
[FEATURE] Emergency Response Team V2
2015-01-15 23:41:20 -06:00
Cheridan
ea4b5b2872
Merge branch 'pinned' of https://github.com/Cheridan/-tg-station into pinned
2015-01-15 16:17:51 -06:00
Cheridan
5f46ebe2b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-15 16:14:27 -06:00
phil235
9e8531448a
Fixes admin logging of gibtonite and gibtonite deposit. Drilling it with a mech, using a kinetic accelerator, and using a resonator log the attacker's name.
...
Gibtonite and gibtonite deposit being triggered by an explosion is now correctly logged.
The explosion of the gibtonite deposit (outside of mining level of course) is now logged.
2015-01-15 00:56:50 +01:00
phil235
bd189431d0
Merge pull request #7002 from Menshin/gunlights_runtimes_fix
...
Fixes "Toggle Gunlight" verb runtimes
2015-01-14 17:29:15 +01:00
paprka
2fd8b3e749
nerfed saber slightly
2015-01-13 20:05:37 -08:00
paprka
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
Steelpoint
3f88acb6f6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
...
Conflicts:
icons/mob/head.dmi
2015-01-14 11:25:07 +08:00
Cheridan
7f46070abf
Update pins.dm
...
-name change for muh fluff
-i am in paprika's pocket
2015-01-13 02:57:08 -06:00
Cheridan
c81eada938
Merge pull request #6737 from tkdrg/hurr
...
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
Cheridan
f8e1fac30c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned
2015-01-12 21:29:00 -06:00
Cheridan
03e1d0d60a
-Adds firing pin box define
...
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
2015-01-12 21:21:34 -06:00
Menshin
0582d87a08
* Fixes "Toggle Gunlight" verb runtimes for guns without any light.
...
* The verb will now only appear if there's a gunlight attached to the gun.
2015-01-13 00:30:54 +01:00
Steelpoint
982c54c2f3
EmergencyResponseTeamV2
2015-01-11 19:21:38 +08:00
tkdrg
3f802d1ae4
Merge pull request #6917 from Nienhaus/FoxV2
...
Fox 2.0
2015-01-10 20:38:58 -03:00
tkdrg
b0635993a4
Revert "[FEATURE] Emergency Response Team"
2015-01-10 19:55:30 -03:00
tkdrg
1756bfc3f0
Merge pull request #6913 from paprka/secborg
...
Hybrid taser / Cyborg taser hotfix
2015-01-10 17:59:27 -03:00
Cheridan
0956a86c22
Firing Pin System - The Lockbox Solution
2015-01-09 18:49:02 -06:00
Nienhaus
4d34f2235e
Fox 2.0
...
https://github.com/tgstation/-tg-station/pull/6489/
2015-01-09 16:41:37 -06:00
paprka
b201c9211e
advanced / cyborg taser hotfix
2015-01-09 09:51:03 -08:00
Steelpoint
34589f52bf
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
code/modules/projectiles/guns/energy/nuclear.dm
icons/obj/gun.dmi
2015-01-09 11:02:50 +08:00
tkdrg
778eb28c15
Repaths practice laser
...
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
Steelpoint
ec821c33d2
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
_maps/map_files/generic/z2.dmm
code/_globalvars/lists/mapping.dm
2015-01-06 12:17:29 +08:00
paprka
0cd34c9c2f
changes syndicate borg equipment
2015-01-05 19:42:31 -08:00
paprka
f0712db606
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby
...
Conflicts:
code/modules/projectiles/guns/energy/stun.dm
2015-01-05 18:43:46 -08:00
carnie
a3f5e7ebfd
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
...
Conflicts:
code/game/gamemodes/setupgame.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
paprka
460a06e683
Reverted some other magazine name changes
2015-01-03 17:23:31 -08:00
paprka
7324891c37
intense p90 fans on /tg/ apparently
2015-01-03 17:21:23 -08:00
paprka
8527f23d85
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby
2015-01-03 17:05:27 -08:00
