Commit Graph

79 Commits

Author SHA1 Message Date
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
Mieszko Jędrzejczak
9f8a8cef9b Grammar and that weird proc. 2016-04-27 10:56:04 +02:00
Mieszko Jędrzejczak
d35248366a Thingies don't embed, icons work. 2016-04-26 11:30:52 +02:00
Mieszko Jędrzejczak
0f7be5576f Gunshot sounds, uplink references, less spammy tommygun, fixes 2016-04-25 11:32:48 +02:00
Mieszko Jędrzejczak
c96712cbf7 Adds the ability to pick up all ammo from a turf using a magazine 2016-04-22 23:35:56 +02:00
Mieszko Jędrzejczak
5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02:00
Fox McCloud
a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian
Revolver Stuff
2016-01-11 00:18:21 -05:00
Fox-McCloud
576eb179e1 Armory Tweak 2016-01-09 23:29:35 -05:00
SamCroswell
eb8b2cc09f Adds Fun 2016-01-07 15:08:12 -05:00
Fox-McCloud
7830cd215b shotgun 2016-01-03 04:03:48 -05:00
Fox-McCloud
eade350dc8 Sec Rifle Port 2016-01-02 01:06:37 -05:00
ZomgPonies
62f4f5cf66 Revolver stuff 2015-12-03 23:18:03 -05:00
Fox-McCloud
58253b23ce ammo tweak 2015-10-07 14:51:14 -04:00
Fox-McCloud
efcbf98c8d how did this not commit 2015-10-06 17:19:07 -04:00
Fox-McCloud
623696b985 Ammo Update and Fixes 2015-10-06 17:18:39 -04:00
Markolie
ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Fox-McCloud
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
ZomgPonies
6dfb4a732d Finally done 2015-05-09 07:12:54 -04:00
ZomgPonies
a05e70585e Fixes 2015-05-08 17:59:42 -04:00
ZomgPonies
cb0a65b96f Let's try this 2015-05-08 17:32:34 -04:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
jack-fractal
a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Fox-McCloud
796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
Fox-McCloud
d9a257c890 Teleporter Gun, Fixes, and Tweaks 2015-03-22 02:45:02 -04:00
Fox-McCloud
96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
ZomgPonies
1f5ef8d4dd Merge pull request #380 from Markolie/master
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
ZomgPonies
1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
Syndi hardsuits
2015-02-22 08:27:38 -05:00
Markolie
efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Fox-McCloud
edde2d10c6 Dart and Syringegun 2015-02-21 09:54:02 -05:00
Fox-McCloud
99d92aea35 Buckshot 2015-02-20 04:46:53 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Fox-McCloud
8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Fox-McCloud
43f3539b94 Merge pull request #11 from Fox-McCloud/Tech-Shells
Tech Shells
2014-11-30 06:44:57 -05:00
Fox-McCloud
805c638adf Tech Shells 2014-11-30 06:36:31 -05:00
Fox-McCloud
9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
Markolie
35fa4600e7 Merge branch 'master' of https://github.com/Markolie/Paradise 2014-11-29 02:39:45 +01:00
Markolie
ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01:00
Fox-McCloud
a4c72d4603 Species and Guns 2014-11-28 19:13:41 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud
650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
SamCroswell
521467fa3e C4 now explodes on detonation, Stechtkin pistol fix
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
TZK13
0a83349284 Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites.
Conflicts:
	code/game/machinery/autolathe.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/projectile/bullets.dm
	icons/obj/ammo.dmi
2014-03-02 01:27:07 -05:00
Rob Nelson
71c07e208a Improved creature AI and random mob spawning in caves.
Also equipment lockers.

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
	code/modules/mining/materials.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/ores_coins.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/guns/energy/special.dm
	compare_report_tg.txt
	icons/obj/device.dmi
	icons/obj/mining.dmi
	icons/obj/vehicles.dmi
	maps/tgstation.2.1.0.0.1.dmm
	maps/vgstation1.0.0.dmm
2014-02-16 04:40:18 -05:00
ZomgPonies
a1656037e4 New guns and gun sprites 2013-12-28 10:46:48 -05:00
ZomgPonies
d4055a89af Buckshot whee! 2013-12-12 22:10:33 -05:00
ZomgPonies
a227fa6cbe Removed zombies, added Skellingtons for halloween. Some bug fixes 2013-10-31 03:21:34 -04:00
ZomgPonies
7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00