Commit Graph

7463 Commits

Author SHA1 Message Date
mwerezak
f4fcb7dcff Fixes apply_damage ignoring species mods
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
2014-06-17 07:10:57 -04:00
mwerezak
f280f8a510 Adds thrown object sharp and edge flags 2014-06-17 07:10:46 -04:00
unknown
331239e726 Adds diona unarmed attack type 2014-06-17 07:10:33 -04:00
unknown
94b6603d30 Fixes projectile sharp and edge flags being ignored
Conflicts:
	code/modules/mob/living/living_defense.dm
2014-06-17 07:10:18 -04:00
unknown
b215859357 Fixes bleeding checks not respecting merged wounds 2014-06-17 07:08:53 -04:00
unknown
37ff8e4175 Fixes large amounts of damage being carried by minor wound types 2014-06-17 07:08: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
ab24ad8a8d Species claws are now sharp
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/species.dm
2014-06-17 07:07:11 -04:00
mwerezak
8b965d21a8 Fixes bruises not having the right damage_type set 2014-06-17 06:56:38 -04:00
mwerezak
ec2ed9f83b Fixes wound merging
Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.
2014-06-17 06:56:27 -04:00
mwerezak
07ab53368c Fixes many small wounds protecting against...
...internal damage.

Also removed started_healing() proc because it doesn't actually report
whether the wound is healing and isn't really used for anything.

Conflicts:
	code/modules/organs/organ_external.dm
2014-06-17 06:56:07 -04:00
mwerezak
07abc91e8e Bullets are now properly sharp
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2014-06-17 06:52:47 -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
mwerezak
cfb05dd741 Fixes wrong wound types being used
This fixes the autoheal bug, which was being caused by wound types such
as tiny bruises from being used even for large amounts of damage.

I imagine that relying on the order of the list returned by typesof() is
always a bad idea.

Conflicts:
	code/modules/organs/organ_external.dm
2014-06-17 06:45:34 -04:00
ZomgPonies
ef5735f96f Fix runtime with morph and monkeys 2014-06-17 04:54:19 -04:00
ZomgPonies
4cfa12aae3 Chemistry Reagent runtime 2014-06-17 04:51:06 -04:00
ZomgPonies
63c5dcf1c4 Necrosis runtime, ugly fix. 2014-06-17 04:27:13 -04:00
ZomgPonies
86a4274a3f add_logs runtime fix 2014-06-17 04:19:41 -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
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
ZomgPonies
044484266d Grav gen fix 2014-06-17 02:03:34 -04:00
ZomgPonies
61b0cb5bd9 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-17 01:20:58 -04:00
Giacomand
8e70f0af6d Fixes the gravity generator not updating your gravity status, so you stop floating.
Conflicts:
	code/modules/power/gravitygenerator.dm
2014-06-17 01:19:42 -04:00
Giacomand
08e6e8f2e2 Finalized gravity bouncing.
Conflicts:
	code/modules/mob/living/carbon/human/human_movement.dm
2014-06-17 01:14:56 -04:00
Giacomand
f32f2b329f Mobs will now slowly bop up and down while in zero gravity.
Conflicts:
	code/game/area/areas.dm
	code/game/turfs/turf.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/gravitygenerator.dm
2014-06-17 01:13:32 -04:00
Necaladun
a2f7e2f3e8 Random Event Chance Tweaks
Reduce viral outbreak and ninja chances.
2014-06-17 14:36:10 +09:30
ZomgPonies
25853d7d79 Slime surgery runtime fix 2014-06-17 00:22:00 -04:00
ZomgPonies
f84214533a Removing even more unneeded test messages 2014-06-17 00:06:53 -04:00
ZomgPonies
e3ed1c3781 Removed a lot of the useless testing and error logging from the runtime log. 2014-06-16 23:01:41 -04:00
ZomgPonies
cd3a972331 Runtime fix due to Vox nitro tanks 2014-06-16 22:56:30 -04:00
ZomgPonies
ddfae9a035 Got another shuttle controller down. One to go. 2014-06-16 21:42:06 -04:00
ZomgPonies
bd75c061f0 Cargo train fixes 2014-06-16 05:14:30 -04:00
ZomgPonies
ed36dbd6d9 2 new karma jobs -- Brig Physician and Magistrate 2014-06-15 23:40:47 -04:00
mwerezak
93060a2766 Fixes old ferry shuttles (e.g. supply) not being able to use move() directly.
This shouldn't be necessary once the supply and emergency shuttles are
updated to the new system, however it will keep them working in the meantime.
2014-06-15 13:55:44 -04:00
Zuhayr
a80c317cbe More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/supplyshuttle.dm
2014-06-15 07:58:00 -04:00
ZomgPonies
2097bed55d 3rd mining overhaul commit, fun KEPT. 2014-06-15 07:52:52 -04:00
ZomgPonies
d31a39256e 2nd mining overhaul commit. Fun KEPT. 2014-06-15 07:45:27 -04:00
Zuhayr
521e5e49ef Ironed out some bugs. Everything should be working for testing purposes. 2014-06-15 07:36:21 -04:00
Zuhayr
ef59deb928 First pass on ore distribution map and stationary drilling rig.
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/modules/mining/coins.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/minerals.dm
	code/modules/mining/satchel_ore_boxdm.dm
2014-06-15 07:35:17 -04:00
Erthilo
6443216183 More Vox clothing. Head and eyes this time.
Conflicts:
	code/modules/clothing/glasses/glasses.dm
	code/modules/clothing/head/collectable.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox/head.dmi
	icons/mob/species/vox/suit.dmi
2014-06-15 06:51:14 -04:00
ZomgPonies
85b8878cbe Made riot helmets and captains space helmet protect against facehuggers 2014-06-15 06:26:41 -04:00
ZomgPonies
d9960d487c Hurrr 2014-06-15 03:58:50 -04:00
ZomgPonies
a211cca4dc Cart fixes 2014-06-15 03:58:19 -04:00
ZomgPonies
c505c0690c Fixes janicart/segway 2014-06-15 02:39:14 -04:00
ZomgPonies
a21ccf0139 Add the other shuttle controllers back in 2014-06-15 01:54:38 -04:00
ZomgPonies
692e7ef435 Fixing biting your own hand off 2014-06-14 23:18:12 -04:00
Loganbacca
80d616e624 Cargo train bugfixes
Also adds admin messaging when someone gets run over.
2014-06-14 22:15:31 -04:00