VampyrBytes
c0f5132664
Cleanup of internal organs
...
Both internal and external organs are a mess, which is making
maintaining and updating them nasty, so I'm cleaning them up, this is
the first stage
mechanical and assisted internal organs are now an object type rather
than a var in the organ which makes it much cleaner and easier to adjust
removed duplicate list of internal organs as there's no reason to have
the same objects in 2 separate lists
made New() a lot cleaner and more robust
External organs will be next
2014-08-21 10:24:13 +01:00
ZomgPonies
6ebb6d617e
Merge pull request #399 from Bone-White/master
...
Rigid suit equip delay rework
2014-08-20 03:07:09 -04:00
ZomgPonies
f4b6450a20
Merge pull request #398 from VampyrBytes/master
...
IPC and nuke disk fixes
2014-08-20 03:07:01 -04:00
Bone White
b5fcd209b2
Rigid suit equip delay rework
...
now uses a couple of new procs, allowing for per-suit tweaking of time.
You now cannot equip eva helms without first attaching them to the suit
(target head use helmet on suit)
2014-08-20 07:28:44 +01:00
VampyrBytes
5b8253fb57
IPC and nuke disk fixes
...
Fix for IPC revival
Prevents nuke disk from being inserted via cavity surgery
2014-08-19 07:06:12 +01:00
ZomgPonies
983d78b775
Merge pull request #395 from IcyV/chemistry
...
Nerfs how effective Tramadol and Oxycodone are
2014-08-18 19:20:20 -04:00
ZomgPonies
b314db6296
Merge pull request #394 from VampyrBytes/master
...
Genetics fixes
2014-08-18 19:19:58 -04:00
ZomgPonies
7139b92b47
Merge pull request #393 from Bone-White/master
...
Diona speed fix
2014-08-18 19:19:05 -04:00
IcyV
60e2785e28
Nerfs how effective Tramadol and Oxycodone are
...
Reduces the amount of shock that they can tolerate to adjust with the new combat changes.
2014-08-18 08:43:13 -07:00
Bone White
9ec8db00f6
Diona speed fix
...
was broken by my eva suit slowdown alterations, now fixed.
2014-08-17 09:49:11 +01:00
ZomgPonies
ebc3098f45
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-08-16 21:48:27 -04:00
Walter0o
8f27fc38a9
comment adjustment according to feedback
2014-08-16 21:47:19 -04:00
Walter0o
6f790b6edf
fixes #5693
2014-08-16 21:47:09 -04:00
Walter0o
ebbeaef854
fixes #5970 , prevents bugs in the future
...
this is not an issue at the moment but will become one should maxHealth ever get changed.
2014-08-16 21:36:34 -04:00
mwerezak
547fada4df
Fixes burn description saying it is salved when not
2014-08-16 21:23:56 -04:00
ZomgPonies
8c965ec9c1
Compile fix
2014-08-16 21:22:21 -04:00
PsiOmega
6158805a68
Fixes #5946 and cuts down on duplicate code across Life() procs.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/mob.dm
2014-08-16 21:18:18 -04:00
ZomgPonies
b06eb66ca4
Fix for bloody hands yanking shit
2014-08-16 20:58:37 -04:00
Bone White
866db87ec0
Removed two debug comments
2014-08-17 00:43:54 +01:00
VampyrBytes
cfef299686
Genetics fixes
...
Fixes issue with getting target in remote talk, remote view and empath
Fixes Empath not recharging
Fixes inability to cancel remote view
Fixes Grays not starting with remote talk
2014-08-16 11:51:17 +01:00
Bone White
aea80f8200
Altered disarm knockdown
...
now only occurs with a 30% chance if you already have an aggressive grab
(or better) on the target.
No more disarm > stun baton.
2014-08-16 06:21:31 +01:00
VampyrBytes
9ecfe0d311
Several fixes
...
Fixes MP's being affected by radiation
Fixes Nuke Ops MP's explosive implant not going off
Fixes PDA Crew Manifest not showing support staff
2014-08-13 11:07:07 +01:00
ZomgPonies
9919eac70d
Merge pull request #380 from Bone-White/master
...
EVA slow alterations
2014-08-13 00:15:15 -04:00
Bone White
7136864763
EVA slow alterations
...
Far less punishing to "better" rig types e.g. CE, syndicate, ERT,
deathsquad, wizard
2014-08-13 01:23:53 +01:00
ZomgPonies
65af681dad
Merge pull request #370 from Regory/tajaran-spawn-gloves
...
Better Racial Item Spawns
2014-08-11 20:37:02 -04:00
Regory
f8ed5bf6b6
Sync Changes from Paradise Master
...
Sync changes
2014-08-09 18:48:19 -04:00
Regory
7ac1d76f80
Fixes equip_or_collect
...
Equip_or_collect fixed to not delete the item being equipped.
Equip or Collect would use equip_or_del, and if failed, would try to
insert the item in a bag. However, equip_or_del deletes the item, so it
cannot be put in the bag afterwards.
2014-08-09 17:53:18 -04:00
Bone White
14f3bc7529
Added pda to strip menu
...
PDAs can be stripped off or placed on a uniform now without having to
remove the uniform.
2014-08-09 17:45:31 +01:00
alex-gh
7b61b6563a
Merge pull request #363 from Bone-White/master
...
Added procedural slow to EVA suits
2014-08-08 03:17:19 +02:00
Bone White
3e285690ae
update for procedural eva slow
2014-08-08 02:11:44 +01:00
Bone White
9ffa4b8ee7
Added procedural slow to EVA suits
...
Slow increases as pressure around them increases. At higher than 80kPa
the slow is 4 units (as compared to diona's natural slow of 5)
2014-08-08 01:39:42 +01:00
ZomgPonies
6e67faf4fc
Merge pull request #358 from VampyrBytes/master
...
More MP fixes
2014-08-06 19:04:26 -04:00
alex-gh
bbc9e51679
is_in_brig() fixes
2014-08-06 23:42:54 +02:00
Jeremy Liberman
a4196cb745
Add Vox Heist directive and call shuttle on completion of Directive X
...
Conflicts:
baystation12.dme
code/controllers/emergency_shuttle_controller.dm
code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
VampyrBytes
5377a879b8
More MP fixes
...
removed immunity to pressure that was added with overheating
MP will now revive when their heads are reattached
2014-08-05 10:48:21 +01:00
Rob Nelson
3a3e8ac7be
Fix grey eyes, add bitching when hairstyles are invalid.
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/new_player/sprite_accessories.dm
2014-08-04 22:29:38 -04:00
Rob Nelson
a78316732f
Fix compile.
2014-08-04 22:23:26 -04:00
Rob Nelson
7e8c1cf7fe
Plasmamen ignite when not wearing their suit.
...
Conflicts:
code/modules/mob/living/carbon/human/human_defines.dm
2014-08-04 22:23:11 -04:00
mwerezak
c22ea7a5c0
Fixes some handcuff oversights
...
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 16:15:47 -04:00
mwerezak
90e0da92cc
Removes duplicate code from human/bullet_act
...
Also moves stun projectile handling up to living/bullet_act, as all the
human specific code has been moved to other procs
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/living_defense.dm
2014-08-03 16:15:10 -04:00
mwerezak
8829bca02b
Cleans up weapon embedding code
...
Removed weapon embedding from human/apply_damage(), as it didn't really
belong there. As well, used_weapon is intended mainly for autopsy info,
so it didn't seem appropriate to use it to embed things.
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-08-03 16:11:04 -04:00
mwerezak
2c7926eff8
Stunbaton fixes and cleanup
...
Apparently harm intent is "hurt", not "harm"
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 16:09:38 -04:00
mwerezak
3eae360963
Handcuffs now require an aggressive grab
...
Conflicts:
code/game/objects/items/weapons/handcuffs.dm
2014-08-03 16:07:35 -04:00
mwerezak
ee9fe24083
Fixes siemens coefficient not blocking stun disarm
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:02:47 -04:00
mwerezak
321598a8a1
Makes humans scream if taking enough halloss
2014-08-03 16:01:04 -04:00
mwerezak
279718728f
Allows the use of stun weapons to show up in autopsies
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:00:48 -04:00
mwerezak
bbdd4641d0
Adds disarm effect for stun weapons and hands
2014-08-03 15:59:39 -04:00
mwerezak
f43a3ead70
Merges taser and stun baton effects
...
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/living.dm
2014-08-03 15:59:21 -04:00
mwerezak
64638987dc
Adds siemens_coefficient handling to stun batons
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:54:34 -04:00
mwerezak
ac0e3966d6
Taser cleanup and fixes
...
Fixes cloaking devices and deadman switches being included in taser code
somehow.
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 15:47:21 -04:00
