e6509ddd23
Merge pull request #17115 from KorPhaeron/gun_fix
...
[S] Fixes minigun bugs
2016-04-27 02:52:22 -05:00
6eb4ffa825
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
...
Conflicts:
code/game/objects/items/devices/lightreplacer.dm
code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
e8cc449e41
Fixes gun duping
2016-04-25 13:39:38 -05:00
f44688ed87
Minigun Fixes
2016-04-25 13:30:16 -05:00
fcf544283d
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
0caa59b21a
First commit of this big PR
...
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
d93d6160cd
Gatling Buff
2016-04-23 19:54:30 -05:00
18ce641950
Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA
2016-04-23 15:14:09 -05:00
ad4782ac41
Tesla Revolver
2016-04-23 13:55:03 -05:00
c771988284
Gatling Autoclick
2016-04-23 13:47:05 -05:00
6ec28fc001
Runtime and MC crash fixes
2016-04-22 11:17:42 -05:00
a39e3f3f1f
Ausops Sprites
2016-04-22 02:16:26 -05:00
5009d5eb5d
Faster firing
2016-04-21 23:32:56 -05:00
84e0fe2b79
Hell lets do 10 damage its an endgame weapon that takes all your inventory
2016-04-21 21:37:58 -05:00
a78ce8712e
Gatling Gun icon fixes
2016-04-21 20:59:07 -05:00
ba3e64ab51
Fixes syringe gun chem reactions
2016-04-21 18:49:22 -07:00
b646b12480
Bit weaker gatling gun
2016-04-21 20:26:58 -05:00
5a813a96a5
Gatling Laser
2016-04-21 20:26:13 -05:00
3527347160
Shock Revolver
2016-04-18 21:29:43 -05:00
64bd2125fa
Slowed recharge
2016-04-16 23:11:25 -04:00
bbf573addb
Update staff.dm
2016-04-16 20:31:30 -04:00
44ff69c799
Honk Bullet ( #16788 )
...
Adds honk bullet and staff.
2016-04-16 12:39:04 +02:00
80eb5833e9
Merge pull request #16470 from KorPhaeron/accelerator
...
Laser Cannon Changes
2016-04-07 18:51:18 +02:00
4d0cc1e0f0
Cannon
2016-04-06 11:37:32 -05:00
a2a554c48a
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/objects/explosion.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/structures/girders.dm
code/game/objects/structures/grille.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/events/wormholes.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
a2bd358eb8
Merge pull request #16507 from PKPenguin321/patch-16
...
fixes being able to grind guns with an autolathe
2016-04-02 20:09:06 -04:00
55434a673d
Heavy Weapon Fix
2016-03-31 12:23:46 -05:00
a74b7c209c
Mining Drone Upgrades
2016-03-31 03:41:03 -05:00
eeb0119acb
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/gamemodes/nuclear/nuclearbomb.dm
code/modules/mob/mob_movement.dm
code/modules/recycling/conveyor2.dm
2016-03-30 22:55:00 -06:00
0e93ef9544
fixes being able to grind guns with an autolathe
...
>but revolver for 90000 TCs
>accidentally click autolathe when you're printing more ammo
>it turns into half a metal sheet's worth of material
2016-03-30 17:03:43 -07:00
fad0e3934e
Fixes recoil, re-adds suit icon toggling
2016-03-30 13:11:33 -05:00
e3dcebc65e
Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
...
# Conflicts:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
2016-03-30 02:12:20 -05:00
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
b44fa098ac
Fixes animated statues being invisible
2016-03-29 19:56:33 -04:00
3f1375ba39
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomZLevels/Cabin.dmm
_maps/RandomZLevels/beach2.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/templates/lavaland_surface_automated_trade_outpost.dmm
_maps/templates/lavaland_surface_biodome_winter.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
code/controllers/subsystem/air.dm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/machinery/computer/arcade.dm
code/game/objects/effects/aliens.dm
code/game/objects/effects/overlays.dm
code/game/objects/items/apc_frame.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/girders.dm
code/game/turfs/simulated.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/mineral_floor.dm
code/game/turfs/simulated/floor/plating.dm
code/game/turfs/simulated/river.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/simulated/walls_reinforced.dm
code/modules/admin/verbs/buildmode.dm
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
code/modules/events/spacevine.dm
code/modules/flufftext/Hallucination.dm
code/modules/holodeck/turfs.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/interactive.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/bot/floorbot.dm
code/modules/mob/living/simple_animal/guardian/guardian.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
code/modules/mob/mob_movement.dm
code/modules/power/singularity/narsie.dm
code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
feb0e6ac70
IT GROWS
2016-03-29 14:34:40 -05:00
8ab833932a
Why'd I do this?
2016-03-29 01:31:15 -05:00
6a55a5b82b
Forgot to tick a file
2016-03-29 01:21:25 -05:00
114ede069c
Lets the projectile pass grilles/windows
2016-03-29 01:09:45 -05:00
177c4c18f8
Accelerator Cannon
2016-03-29 00:44:39 -05:00
cf7885addd
Merge pull request #16402 from Core0verload/revert-15671-Newtaser
...
Revert "Introduces the new taser"
2016-03-28 18:44:34 -05:00
e829213938
Mining Balance
2016-03-28 06:30:26 -05:00
eeeff80e5f
Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues
...
Fix bundle
2016-03-26 21:06:00 -05:00
fe253ec0b9
Revert "Introduces the new taser. "
2016-03-26 23:01:18 +03:00
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
b9090ffef2
Merged with master.
...
Solved armor bypass.
2016-03-22 16:07:38 +01:00
e41a25549e
Xray lasers now have unique sprites and inhands
2016-03-17 23:21:52 -04:00
fa62cefaac
Merge pull request #15958 from Impisi/ImprovisedShellChanges
...
Improvised Shell Rework Attempt 2
2016-03-12 15:16:08 -06:00
b204c2f333
Merge pull request #15825 from tkdrg/am_i_hg_yet
...
Nerfs the detective's revolver
2016-03-11 12:52:50 -06:00
Cheridan
phil235
KorPhaeron
phil235
KorPhaeron
Shadowlight213
Robustin
AnturK
duncathan
Joan Lung
PKPenguin321
Xhuis
Core0verload
CPTANT