Commit Graph

403 Commits

Author SHA1 Message Date
DJSnapshot e1af1f4713 replaced electrodes with insta hit taser beams.
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/projectile/beams.dm
	icons/obj/projectiles.dmi
2014-04-19 16:28:23 -04:00
Necaladun dc417a522d Stun Revolver Upgrade
Stun Revolver update - makes it do slightly less pain, but a little bit
of stun and weaken to give it some actual purpose
2014-04-15 00:28:38 +09:30
d3athrow d5e4fd0f33 Muh pod equipment
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-03-24 07:49:37 -04:00
d3athrow d8fa6f65dc Dionas can't into guns
Conflicts:
	code/modules/projectiles/gun.dm
2014-03-06 21:07:43 -05:00
Cheridan b66abb1a6e adds the mime mech
Conflicts:
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/projectiles/projectile/bullets.dm
	icons/mecha/mecha.dmi
	icons/mecha/mecha_equipment.dmi
2014-03-05 22:43:36 -05: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
ZomgPonies 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Incoming 6979765adb rerebalanced the SoC after running the odds
Conflicts:
	code/modules/projectiles/projectile/magic.dm
2014-02-16 05:47:17 -05:00
Incoming d1cbeffbb1 Animate statues in magic stuff/Staff of Change rebalance
Adds animate statues to the Staff of Change pool of mobs
Adds specific synergy between flesh to stone and the staff of animation where if you animate your statue'd people they'll turn to animated statues controlled by the victim who are instructed not to dunk the wizard.

Splits the "animal" sub pool in the Staff of Change into "Beast" and "Helpless Animals" to help raise the odds of the former against the latter. Changed odds will be reported in a comment to follow.
2014-02-16 05:44:51 -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 2c9dee38cb Merge pull request #155 from alex-gh/revolver_ck
Revolver conversion kits now modify revolvers without catastrophic failu...
2014-02-11 18:50:08 -05:00
alex-gh e0d84dba7e Revolver conversion kits now modify revolvers without catastrophic failure chance 2014-02-11 12:10:09 +01:00
ZomgPonies 27950d0542 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-02-10 07:08:48 -05:00
Loganbacca f4eb9aea73 Bullet inscriptions
- Can inscribe text into bullets by using a screwdriver on a bullet casing
- Does not work on non-metal type bullets (i.e. rubber bullets, beanbags, stunshots, etc)
- Added weakbullet subtypes "rubber bullet" and "beanbag" with appropriate names

Conflicts:
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/projectile/bullets.dm
2014-02-10 07:07:49 -05:00
Regen 2abd278744 Heavy laser buff and new sniper projectile
Boosted the heavy laser to do 45 damage instead of 40, making it
slightly better than the standar laser.
Made the energy drain slightly less on mechs
Added a more slim projectile to the sniper rifle, the old fruit shot was
to fat
2014-02-08 13:20:59 +01:00
SamCroswell bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
Ergovisavi f85ac1af63 Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten.
Conflicts:
	baystation12.dme
	code/modules/mob/living/simple_animal/friendly/mushroom.dm
2014-02-01 05:27:59 -05:00
Ccomp5950 b79edf513c Sniper Rifle fix.
You have no HUD when zoomed.  None, I'm unable to move every HUD element while zoomed in so you lose it.  Consider it part of your concentration while zoomed in.

If you move while zoomed in you automatically zoom out, you lose concentration.

If the rifle isn't in your active hand you can't zoom in.

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
2014-01-28 23:30:02 -05:00
ZomgPonies 959d3137da compile fix 2014-01-23 10:26:25 -05:00
Ergovisavi 89c23fc494 Kinetic gun can now break through mining tiles due to the goliath being able to possibly trap you in an unwinnable situation otherwise
More mob behavior vars in hostile animal, added Passtable to hivelord and brood and removed their environment smash

Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
2014-01-23 10:22:07 -05:00
Ergovisavi 78bea65a44 Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/projectiles/ammunition/energy.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/special.dm
	icons/mob/animal.dmi
	icons/obj/projectiles.dmi
2014-01-22 16:39:54 -05:00
Tenebrosity 67c88c42e7 Adds generic impact noises to all projectiles
Overrides the generic sounds with specific ones for electrodes and
lasers.

Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/energy.dm
2014-01-22 10:20:16 -05:00
Rob Nelson d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
Rob Nelson 22a2df1115 Standardize HULK.
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
ZomgPonies 90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
ZomgPonies 1caf56a29f Buff pulse rifles 2014-01-15 08:10:40 -05:00
Hornygranny 95835ac98c Changed neurotoxin from a child of energy to a child of bullet
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2014-01-13 04:36:15 -05:00
Hornygranny 5a443e5010 Replaced spaces with tabs. 2014-01-13 04:27:18 -05:00
Hornygranny 6eefff2c68 Code by Giacom. Changes alien neurotoxin spit to dumbfire.
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
2014-01-13 04:27:08 -05:00
ZomgPonies 2494bfb177 Doubled the shot capacity of the taser 2014-01-11 07:30:35 -05:00
d3athrow f8bee9a356 Fixes nonhumans getting stuck in walk mode after being targetted 2014-01-07 18:14:49 -05:00
ZomgPonies 9b6f9c07a6 Regens sniperlaser 2013-12-30 13:02:43 -05:00
ZomgPonies 54154ce581 Wizard stuff balancing 2013-12-28 19:39:35 -05:00
ZomgPonies a1656037e4 New guns and gun sprites 2013-12-28 10:46:48 -05:00
ZomgPonies 9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies ecaaec5257 Magic Overhaul Part Deux 2013-12-18 02:30:55 -05:00
ZomgPonies 12b8ae8d76 Magic Overhaul 2013-12-14 05:54:03 -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 19596fa6fd Bug fixes 2013-11-24 11:23:54 -05:00
ZomgPonies 0faab50c64 Mime love -- Baguette-shooting french crossbow 2013-11-21 09:28:45 -05:00
ZomgPonies f07b6616d3 Added a HONK rifle to the HONKsquad, shoots snap-pops 2013-11-16 02:27:20 -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 81d393d20b Bug fixes and paincrit balances 2013-10-31 04:07:57 -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 f13d5db588 Blood dialysis 2013-10-20 20:01:28 -04:00
ZomgPonies 359d5dd541 Beamcode fix 2013-10-20 19:59:29 -04:00
ZomgPonies 5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00