Commit Graph

547 Commits

Author SHA1 Message Date
Fox-McCloud
cedb71e8af Clarity 2015-03-22 20:18:01 -04:00
Fox-McCloud
d9a257c890 Teleporter Gun, Fixes, and Tweaks 2015-03-22 02:45:02 -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
SamCroswell
62ae69c816 Ninja File Structure Rework
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.

Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
SamCroswell
addfbe449e Adds Shuriken 2015-03-09 21:28:28 -04:00
Fox-McCloud
253563e211 Energy Tweaks 2015-03-03 16:00:07 -05:00
Fox-McCloud
c1a1f851cf Cyborg Rebalance 2015-03-02 22:54:09 -05:00
Markolie
607ebed0f0 Further turret fixes 2015-03-01 02:53:01 +01:00
Markolie
b28f791f8f (Porta) turret update, map area update 2015-03-01 02:10:32 +01:00
Markolie
20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
Fox-McCloud
9850e6deb2 Laser Additions and Taser Nerf 2015-02-25 23:34:42 -05:00
ZomgPonies
5421754760 Merge pull request #418 from Fox-McCloud/Fixes-Genetics
Fixes, Genetics, and Balance
2015-02-25 21:56:33 -05:00
Fox-McCloud
85d79677b1 Fixes, Genetics, and Balance 2015-02-24 22:58:05 -05:00
SamCroswell
cd7b1a4075 ERT Rework - Part One 2015-02-24 09:47:44 -05: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
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie
3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +01: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
be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -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
354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
d10451c567 Fix a bunch of runtimes 2015-02-09 04:03:20 +01:00
Fox-McCloud
af78338a99 Nerfborgs 2015-02-08 00:22:13 -05:00
Fox-McCloud
8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
Fox-McCloud
6e7ac1ec5e Merge pull request #247 from TheDZD/minor-fixes
Cyborg Cell Recharging Fix
2015-02-01 14:55:55 -05:00
DZD
16fafcdf5f Cyborg Cell Recharging Fix
- Fix for syndicate borg LMG and security borg draining extra charge
while in the hotbar, despite being fully charged.
2015-02-01 10:37:35 -05: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
Fox-McCloud
3104a9f1e0 Merge pull request #212 from TheDZD/cyborg
Security and Syndicate Cyborg Changes [Ready to Merge]
2015-01-24 16:19:44 -05:00
DZD
a7c9c2a789 Actually makes LMG cost 300 per shot 2015-01-24 14:54:29 -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
DZD
add99533fc Practice and Lasertag Logs
- Adds ability to turn off admin chat logging for specific projectiles.
- Turns off admin chat logging for practice laser and lasertag beams.
2015-01-22 12:06:30 -05:00
DZD
f1eb7971e1 Armor/Damage Changes
- Fixes armor RNG killing for thrown items.
- Kidan no longer act like they have a built-in riot shield (50 -
damage/3)% chance to ignore damage, but take 20% less brute
consistently.
- Entirely missing with a projectile or melee attack is impossible, but
you are more likely to hit a part you were not aiming at. (Ports tg
ran_zone proc and axes current get_zone_with_miss_chance proc).
- Removes some snowflake code for lightning projectiles (Power Glove
traitor item uses these).
2015-01-17 22:33:47 -05:00
DZD
648a5c8fb4 Kills Armor RNG
Ports over non-RNG armor from /tg/, currently is having issues with
thrown items (no damage if armored).
2015-01-17 20:22:12 -05:00
Fox-McCloud
a1b5c0d609 Merge pull request #179 from Markolie/master
Bug fixes
2015-01-16 19:09:16 -05:00
Markolie
b9ccb857d0 Energy gun description fix, UO45 fix, temporarily disable the engi shuttle 2015-01-17 01:05:23 +01:00
DZD
3939abaf5d Fix Conflicts and Sync with Upstream
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
2015-01-16 17:07:22 -05:00
DZD
475ca3f666 Wizard Update Part 8
- Fixes horsemask spell to work on non-human races.
- Removes ability of Summon Item to mark and recall brains due to
problems with organ system.
- Makes weeping angels turn back to their human form after Flesh to
Stone wears off if they were created via F to S and the Staff of
Animation. (/tg/ port)
2015-01-16 16:39:12 -05:00
Fox-McCloud
73d59113c3 Kinetic Accelerator 2015-01-15 21:58:51 -05:00
DZD
5307d376da Wizard Update Part 7
(That last commit was supposed to be Part 3, not 6, but might as well
roll with it)

- Ports over the summon item spell from /tg/, it allows the wizard to
mark an item and then later recall it to his hands. If it is within
another item, that item will be recalled with the marked item inside.
- Removes RNG max charge variation on staffs, most staffs will now have
6 max charges (Rather than a 25% chance of 8, 50% of 4, and 25% of 3),
the exception being the Staff of Door Creation and Staff of Chaos, which
each have 10 charges.
- Adds summonitem to Summon Magic.
- Summon Guns/Magic now cost 1 spell slot each once again.

All ported from /tg/ with the exception of the Summon Guns/Magic cost
changes, as well as the remove of staff charge variation.
2015-01-15 17:05:49 -05:00
DZD
62c76ba2ef Wizard Update Part 6
- Attempt to fix back sprite for new staffs.
- Fireball wand now has a proximity detonation similar to the fireball
spell.

Ported from /tg/.
2015-01-15 15:50:10 -05:00
DZD
9af973a835 Wizard Update Part 2
- Adds in_hands for the Staff of Chaos and Staff of Door Creation
- Adds back sprites for said staffs, although they do not actually
appear for whatever reason, back sprites for older staffs also do not
appear.
- Adds unique sprites for the two staffs.

Ported from /tg/.
2015-01-14 22:30:51 -05:00