ZomgPonies
ae618ec644
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-06-19 15:25:38 -04:00
ZomgPonies
8b77070cbe
Added new minerals and sprites to mining
2014-06-19 15:24:03 -04:00
Necaladun
bef546bb7b
3rd times the charm - trinary
...
Changed to :5 because :t was conflicting with something to do with
radio?
2014-06-20 04:15:15 +09:30
ESwordTheCat
d17486b635
Revert it to this.
2014-06-19 10:34:26 -04:00
ESwordTheCat
d81d1736fc
Remove spawn.
2014-06-19 10:34:14 -04:00
ESwordTheCat
bb54ac1ac4
Fix artifact spreading and large scanner. Remove extra list used the master_controller var again.
...
Conflicts:
code/modules/mining/mine_turfs.dm
code/modules/research/xenoarchaeology/misc.dm
code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
2014-06-19 10:33:50 -04:00
Jarcolr
4f20de625c
Fixes #5255 and walking over edges
...
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
2014-06-19 10:14:35 -04:00
mwerezak
428bf6d350
Adds supply shuttle docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-19 10:13:48 -04:00
mwerezak
175c48240d
Makes the supply shuttle process in a tighter loop
...
Conflicts:
code/game/supplyshuttle.dm
2014-06-19 09:54:45 -04:00
mwerezak
723979115c
Renames supply controller global var
...
Renamed from 'supply_shuttle' to 'supply_controller'
Conflicts:
code/controllers/verbs.dm
code/game/gamemodes/gameticker.dm
code/game/supplyshuttle.dm
2014-06-19 09:52:35 -04:00
mwerezak
bc2fa7940a
Adds supply shuttle datum
2014-06-19 09:40:28 -04:00
mwerezak
6b692feff0
Armour can turn sharp attacks into blunt ones
...
Kind of messy, but I couldn't find another way to do it without
reworking a lot of the mob defence procs.
2014-06-19 09:40:04 -04:00
mwerezak
6e7139087e
Fixes human/checkarmor getting the armour...
...
...value for the wrong body part.
Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
2014-06-19 09:39:44 -04:00
mwerezak
b7c3e13901
Fixes special shuttle consoles being...
...
...deconstructible
2014-06-18 22:18:08 -04:00
mwerezak
a06850450a
Fixes tails not rendering on the player preview
2014-06-18 22:17:29 -04:00
Boop
93d7f057e0
Fix runtime with brains and throwmode
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
2014-06-18 22:14:44 -04:00
ZomgPonies
63cfbd6667
Revert "Removed inaprovaline fixing Internal bleeding"
...
This reverts commit 82ef708223
2014-06-18 08:26:17 -04:00
ZomgPonies
93dc02a702
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-06-18 08:22:49 -04:00
Boop
3ab1011a85
Fixes #5291 and another wound runtime
2014-06-18 08:22:33 -04:00
Necaladun
187f56d996
Kidan language fix
...
Kidan language to :4 instead of :l to avoid radio chat
2014-06-18 21:50:07 +09:30
Regen
7de8683435
Gave nightvision to Aliens and Shadow people
2014-06-18 14:01:55 +02:00
ZomgPonies
37e975fcc8
Merge pull request #261 from Bone-White/master
...
Pickpocket Gloves fix
2014-06-18 06:34:37 -04:00
Bone White
89b8a002bf
Pickpocket Gloves fix
...
They can now take/place ids without notifying, and ids enter the
pickpocket's hand instead of dropping to the floor or not working.
2014-06-18 11:04:33 +01:00
ZomgPonies
384992c9fc
Merge pull request #252 from Regen1/Combat-borgs
...
Combat borgs + various tweaks
2014-06-18 06:01:46 -04:00
Necaladun
4340ba620d
Fixing a derp
...
trinary should be t
2014-06-18 18:43:01 +09:30
ZomgPonies
4fb9cf4aa9
Final shuttle controller for ERT/DS shuttle.
2014-06-18 01:12:28 -04:00
Necaladun
7fec1c561c
MP Language
...
Trinary for MP
2014-06-18 12:18:36 +09:30
alex-gh
845edf79d5
Added E-N emagging
2014-06-18 01:38:48 +02:00
ZomgPonies
c7fc93538e
Update icon energy gun runtime
2014-06-17 11:07:22 -04:00
ZomgPonies
2db1c0c5ab
Fixes streaming music bug
2014-06-17 11:03:10 -04:00
ZomgPonies
1132879810
Fixed up the stupid handcuff shit that's been bugging me forever.
2014-06-17 10:26:04 -04:00
mwerezak
71af102747
Fixes armour being applied to projectiles twice
2014-06-17 07:11:08 -04:00
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
