Commit Graph

126 Commits

Author SHA1 Message Date
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
ZomgPonies
4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
jack-fractal
a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Markolie
1cb3e38b65 Update saw-off code 2015-03-16 19:36:40 +01:00
Markolie
cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
Fox-McCloud
6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
Fox-McCloud
96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie
72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +01:00
Fox-McCloud
edde2d10c6 Dart and Syringegun 2015-02-21 09:54:02 -05:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
DZD
a93ef4dd1b The Return of the Shoulder Holster
- Detective's shoulder holster now only fits projectile-based (not
energy) handguns.
- Swaps the detective's belt holster for the old shoulder holster.
- Makes some specific handguns actually fit inside of holsters.

- Unrelated: Removes a debug output from
/code/modules/power/singularity/generator.dm
2015-01-29 13:23:46 -05:00
DZD
6ea11601a7 Security and Syndicate Cyborg Changes
- Security cyborg's taser now properly draws from a cell that slowly
recharges from the cyborg's main battery, rather than drawing directly
from the main battery. 6 shots then CLICK until it recharges.
- Replaces Syndicate cyborg's recharging energy crossbow with a
non-recharging grenade launcher, still stuns, but does a good bit more
damage. (TG port)
- Replaces the Syndicate cyborg's laser with an LMG. (TG port)
- Nerfs cost per projectile to 300 from TG's 20, because a 300 shot
recharging clip is utterly overpowered, not to mention the fact that it
hardly affected the borg's battery when recharging.
- Cost of the cyborg's laser gun prior was 830, so this is still a buff.
However it no longer pulls directly from the cyborg's main battery,
instead pulling from a 6000 charge battery that slowly recharges from
the main battery.
2015-01-24 14:53:34 -05:00
Fox-McCloud
8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Fox-McCloud
9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
SamCroswell
ceabc46f1b Dismemberment Update, Fire Axe Fixes, Gun Sounds 2014-11-23 00:52:32 -05:00
SamCroswell
90bb1c5861 Weapon description update
Updated a few weapon descriptions to fit properly.
2014-11-22 13:33:25 -05:00
SamCroswell
c75529462d Bulldog In-Hand Fix 2014-11-14 23:34:47 -05:00
SamCroswell
722fd6a1e0 Nukeops Update
- Gave the nukeops leader the ability to choose the name of their team.

- Gave the Bulldog an in-hand icon identical to the c20r until we can
figure out how to add left hand right hand icons without breaking
everything.

- Added a helmet for the Syndicates, identical to the helmet they
already had with a special icon.

- Replaced the SWAT helmet they had in their lockers with the new Syndi
helmets.
2014-11-08 10:51:20 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Bone White
fff6f2a264 French Crossbow Ammo Restriction
Prevents arrows and rods being used in a french-powered crossbow.  Also
added preventative measure for cell installation.

Requested by Fox.
2014-10-24 14:11:55 +01:00
mwerezak
4b647c1905 Fixes xbow tension not being rest when fired 2014-08-16 20:58:58 -04:00
Zuhayr
7c07240ac9 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/alien.dm
	code/modules/projectiles/guns/projectile/crossbow.dm
	code/modules/projectiles/guns/projectile/pneumatic.dm
	icons/mob/back.dmi
	maps/tgstation2.dmm
2014-07-21 06:10:45 -04:00
mwerezak
a07b7a5ce3 Thrown items can be targeted, has miss chance...
...based on distance, similar to projectiles.

Conflicts:
	code/defines/obj.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/vending.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/games/cards.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living_defense.dm
2014-07-16 09:53:34 -04:00
mwerezak
4a2993b20b Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
Cheridan
88aceb454d Update shotgun.dm
shells spin faster
Conflicts:
	code/modules/projectiles/guns/projectile/shotgun.dm
2014-06-17 02:45:09 -04:00
Cheridan
3244291624 Casing rotation
Spent casings ejected from firearms will spin as they 'tumble' towards the ground.
Improved sprites for shotgun shells
Improved sprite for bullet projectile.

Conflicts:
	code/__HELPERS/matrices.dm
	code/modules/projectiles/guns/projectile.dm
	icons/obj/ammo.dmi
	icons/obj/projectiles.dmi
2014-06-17 02:40:47 -04:00
Zuhayr
1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
2014-05-12 02:59:53 -04: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
ZomgPonies
48ca1f1a32 Fix shotgun sounds 2014-04-30 13:29:48 -04:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
alex-gh
e0d84dba7e Revolver conversion kits now modify revolvers without catastrophic failure chance 2014-02-11 12:10:09 +01:00
SamCroswell
bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
ZomgPonies
a1656037e4 New guns and gun sprites 2013-12-28 10:46:48 -05:00
ZomgPonies
25becb2c49 Shotgun fix 2013-12-13 00:13:47 -05:00
ZomgPonies
d4055a89af Buckshot whee! 2013-12-12 22:10:33 -05:00
ZomgPonies
0faab50c64 Mime love -- Baguette-shooting french crossbow 2013-11-21 09:28:45 -05:00
ZomgPonies
a83c4c3fa3 Rocket launcher weapon! 2013-11-07 16:06:09 -05:00
ZomgPonies
1368fb3bfb Projectile update 2013-11-01 14:00:50 -04: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
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
853d490660 Various fixes. 2013-09-27 02:41:41 -04:00
ZomgPonies
b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00