Commit Graph

499 Commits

Author SHA1 Message Date
SamCroswell
addfbe449e Adds Shuriken 2015-03-09 21:28:28 -04:00
Fox-McCloud
85d79677b1 Fixes, Genetics, and Balance 2015-02-24 22:58:05 -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
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
8667786655 Crossbow Rework 2015-02-03 23:35:09 -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
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
Fox-McCloud
73d59113c3 Kinetic Accelerator 2015-01-15 21:58:51 -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
1c3d247aca Wizard Update Part 1
- Wands will no longer display a missing sprite if you try to fire one
while it is drained. (Only change that wasn't ported from /tg/)
- When using a staff of change on somebody, you can now turn them into a
goat or space bats, and when turning them into a cyborg, there is a
chance of that cyborg being a syndicate cyborg.
- Ports over page-based UI for the Wizard's spellbook from /tg/.
- Ports over the Wand Belt, Staff of Chaos, and Staff of Door Creation
from /tg/. The Wand Belt contains several useful wands, however all of
them have limited charges. The Staff of Chaos will cause a different
projectile spell effect each time it is cast, and can currently imitate
any of the wands. The Staff of Door creation will create wooden doors
over any solid turf they contact, doing so removes said turf.
- Mind swap will no longer remove spells from the wizard due to RNG.
- The charge spell will no longer damage the charge of weapons that
normally recharge by themselves.
- Adds Staff of Door Creation to the Summon Magic list, removes the
staff of change from the normal Summon Magic list and makes it part of
the special list
- If Summon Magic rolls to create an item on the special list, it will
create that item once, and will no longer create anything else from the
special list. (List consists of the Staff of Change, Staff of Animation,
Wand Belt, Staff of Chaos, and Contract).
2015-01-14 21:56:39 -05:00
Fox-McCloud
e23841c46f Rebalance Stamina 2015-01-05 06:53:48 -05:00
Fox-McCloud
43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Fox-McCloud
525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Fox-McCloud
03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Fox-McCloud
53d15682ce Melee Rebalancing 2014-12-18 10:22:02 -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
Markolie
e31886016b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/structures/window.dm
2014-12-13 02:15:05 +01:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud
1b4cd99491 Merge pull request #64 from Fox-McCloud/Stamina
Stamina
2014-12-12 08:19:39 -05:00
Fox-McCloud
e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Markolie
46a061e722 Bug fixes 2014-12-11 15:20:45 +01:00
Fox-McCloud
21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Fox-McCloud
805c638adf Tech Shells 2014-11-30 06:36:31 -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
SamCroswell
8b16d394ed Projectile Laser Update
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -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
Fox-McCloud
8c1f6431e6 Tweaks and Fixes and Major Map Changed
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
ZomgPonies
e4d2cb53e4 Merge pull request #359 from Bone-White/master
Rubber bullets now cause agony/halloss instead of stun
2014-08-06 19:04:35 -04:00
Bone White
f63a1995b8 Rubber bullets now cause agony/halloss instead of stun
As title, by Mel's request.  Makes sense with the stunbaton nerf to nerf
rubber bullets too.  Two shots cause incapacitation (as opposed to three
from a taser).
2014-08-06 20:41:31 +01:00
ZomgPonies
db4a165244 Turned heavy laser into a kind of laser minigun. Still more bang for your buck than a regular laser 2014-08-05 00:11:57 -04:00
ZomgPonies
509af0b236 Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun 2014-08-04 01:54:27 -04:00
ZomgPonies
431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00
ZomgPonies
4b98dc1ff4 Xeno nerf 2014-07-21 10:08:02 -04:00
ZomgPonies
64554340f4 Modifed faction system to use a list instead. Mobs can belong to multiple factions at once. 2014-07-19 13:26:55 -04:00
Rob Nelson
08813d45cc Fix potential ready-dna problems.
Conflicts:
	code/game/machinery/cloning.dm
	code/modules/projectiles/projectile/change.dm
2014-07-18 06:18:12 -04:00
Kelenius
c54b9e3626 Slime update
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
mwerezak
6ada0cf263 Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_misc.dm
2014-06-17 07:08:25 -04:00
mwerezak
07abc91e8e Bullets are now properly sharp
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2014-06-17 06:52:47 -04:00
alex-gh
0eed06bcc9 Stunbeams should no longer destroy computers 2014-06-02 09:49:58 +02:00
ESwordTheCat
a6ee8dc678 Revert gun pool for now.
Conflicts:
	code/game/machinery/turrets.dm
	code/modules/projectiles/projectile/beams.dm
2014-05-19 19:34:20 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master
Nukeops Weapons Rework
2014-05-04 15:43:03 -04:00
SamCroswell
2081699e54 Bullet damage tweaks
Upped the L6's bullet damage due to how high the cost of it is. Subject
to change, as always.
2014-05-04 11:01:39 -04:00
ESwordTheCat
532298c725 Tweak object pool system.
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
2014-05-03 22:54:09 -04:00
ESwordTheCat
33c492ae4c Fixed all the runtimes. 2014-04-29 13:39:50 -04:00