Commit Graph
438 Commits
Author SHA1 Message Date
ZomgPonies 384992c9fc Merge pull request #252 from Regen1/Combat-borgs
Combat borgs + various tweaks
2014-06-18 06:01:46 -04:00
ZomgPonies c7fc93538e Update icon energy gun runtime 2014-06-17 11:07:22 -04:00
mwerezakandZomgPonies 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
mwerezakandZomgPonies 07abc91e8e Bullets are now properly sharp
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2014-06-17 06:52:47 -04:00
mwerezakandZomgPonies 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
Necaladun 1ce1f0df37 Xray laser
Was still at charge cost 50 - up to 500 now
2014-06-17 16:56:20 +09:30
Necaladun 0265660fb2 Stun Revolver Upgrade
Stun revolver uses the old style single shot rather than a beam, but
hits harder.
2014-06-17 16:56:20 +09:30
Necaladun eb97932ca5 Egun Fix
Eguns now have proper ammo cost, 10 shots standard, not 100.
2014-06-17 16:56:19 +09:30
CheridanandZomgPonies 88aceb454d Update shotgun.dm
shells spin faster
Conflicts:
	code/modules/projectiles/guns/projectile/shotgun.dm
2014-06-17 02:45:09 -04:00
CheridanandZomgPonies 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
Regen 7263fc5eef More PR fixes I guess 2014-06-14 22:46:05 +02:00
ZomgPonies 386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
Regen b6f12108e4 Nerfed combat borgs
Made the cell charge it costs to use the laser 500 instead of 100, since
it gave borgs WAAAY to many shots before they have to even consider
going back to charge
Fire delay also doubled, because we don't want them to waste everything
in two seconds, and it was way quick before, still considerabily fast,
though
2014-06-11 19:49:48 +02:00
alex-gh 0eed06bcc9 Stunbeams should no longer destroy computers 2014-06-02 09:49:58 +02:00
ZomgPonies 11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
ZomgPonies b81acff7a3 Fix charge_costs of guns 2014-05-24 14:03:37 -04:00
ESwordTheCatandZomgPonies 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
ZuhayrandZomgPonies 43e60ab01e Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.

Noise cannon fire sound, Vox shriek sound.

Added Vox Armalis species.

Swapped vox breath mask over to species_restricted check.

Added Vox Armalis gear.

Added a random shriek effect to Vox and Vox Armalis speech.

Added quickspawn Vox Armalis definition.

Vox shriek sound effect. Thought I committed this earlier.

Added r_hand and l_hand icon_overwrite checks.

More work on Armalis. Added gut() and leap() human procs.

Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().

Fixing some missing pixels in the armalis tail.

Almost forgot to whitelist armalis...

Conflicts:
	code/modules/clothing/spacesuits/alien.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/gun.dmi
2014-05-14 18:24:01 -04:00
ZuhayrandZomgPonies 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
ZomgPonies b8a70103d7 Fix soem bugs -- Immortal Facehugger and Cap laser rechargerate 2014-05-07 00:06:50 -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
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
ESwordTheCatandZomgPonies 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
Regen f63a5bed01 Fixed L.W.A.P charge cost 2014-05-03 17:02:41 +02:00
ZomgPonies 36b52731f0 Changing power numbers to balance gun upgrades 2014-05-01 16:23:09 -04:00
ZomgPonies 48ca1f1a32 Fix shotgun sounds 2014-04-30 13:29:48 -04:00
ESwordTheCatandZomgPonies 33c492ae4c Fixed all the runtimes. 2014-04-29 13:39:50 -04:00
ESwordTheCatandZomgPonies 2382984c03 Some optimization at object pooling, tinkering at beams.dm and reverting useless code.
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-04-29 13:39:20 -04:00
ESwordTheCatandZomgPonies 774a4407da Moar object pool.
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
2014-04-29 13:36:39 -04:00
ESwordTheCatandZomgPonies ebfcc9be79 Object pool for beam projectile, minor changes to object pool.
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2014-04-29 13:33:06 -04:00
Mloc-ArgentandZomgPonies fcdcef5931 human: move organ generation into a species proc
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
2014-04-28 21:09:45 -04:00
paprkaandZomgPonies f98cfc75ec final stuff
Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-04-28 20:36:56 -04:00
ZomgPonies 8abf352b2a Fixes cyborg laser + emp problem 2014-04-28 20:09:33 -04:00
ZomgPonies 01bbf00d2c Ability to upgrade powercells in energy weapons 2014-04-27 18:20:59 -04:00
DJSnapshotandZomgPonies 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
d3athrowandZomgPonies d5e4fd0f33 Muh pod equipment
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-03-24 07:49:37 -04:00
d3athrowandZomgPonies d8fa6f65dc Dionas can't into guns
Conflicts:
	code/modules/projectiles/gun.dm
2014-03-06 21:07:43 -05:00
CheridanandZomgPonies 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
TZK13andZomgPonies 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
IncomingandZomgPonies 6979765adb rerebalanced the SoC after running the odds
Conflicts:
	code/modules/projectiles/projectile/magic.dm
2014-02-16 05:47:17 -05:00
IncomingandZomgPonies 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 NelsonandZomgPonies 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
LoganbaccaandZomgPonies 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