Commit Graph

8060 Commits

Author SHA1 Message Date
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
VampyrBytes
32b6eb9813 Revert "fix for runtime caused by #398"
This reverts commit 98a0e85227.
2014-08-21 10:09:34 +01:00
VampyrBytes
98a0e85227 fix for runtime caused by #398
God knows why this was a var/tmp
2014-08-20 14:04:07 +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
d2129341b9 Adds equip/unequip times to rigid suits
Also stops helmets being worn without the rigid suit already on the mob.
2014-08-18 08:16:06 +01: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
Walter0o
0c02bd02dd fixes #5964 2014-08-16 21:36:22 -04:00
mwerezak
547fada4df Fixes burn description saying it is salved when not 2014-08-16 21:23:56 -04:00
mwerezak
15a6b95112 Fixes infection fever causing burn damage 2014-08-16 21:23:47 -04:00
mwerezak
8d04e8b9c6 Fixes a few issues with get_wound_type()
Fixes damage causing "healing" wound types that can't bleed.
Fixes flesh wounds not bleeding the instant they heal any damage.
2014-08-16 21:23:36 -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
Chinsky
ab1fdeae25 Added suggested new type of wounds for stumps 2014-08-16 21:13:12 -04:00
Chinsky
1f55a8c491 Made missing limbs not process.
Moved code in processing so that ORGAN_DESTROYED limbs won't process wounds and chemicals. They still need to process once to actually fall off (too lazy to change that)
Made dropping limbs remove all wounds and germs. Instead, one big wound is spawned on parent organ. Damage depends on the organ.
Removed missing  limbs bleeding on their own, since that's what that wound is for now.
They still would ache until surgically mended anyway.
Fixed possible issue with amputation not fixing the rotten limb.

Conflicts:
	code/modules/organs/organ_external.dm
2014-08-16 21:13:00 -04:00
mwerezak
af0ab6fc5c Fixes runtime in train/explode() 2014-08-16 21:10:23 -04:00
mwerezak
183c25167c Fixes #5915
Also allows checking remaining engine charge by examining, and removes
the verb.

Conflicts:
	code/modules/vehicles/cargo_train.dm
2014-08-16 21:08:25 -04:00
mwerezak
4b647c1905 Fixes xbow tension not being rest when fired 2014-08-16 20:58:58 -04:00
ZomgPonies
b06eb66ca4 Fix for bloody hands yanking shit 2014-08-16 20:58:37 -04:00
ZomgPonies
88a95cc737 Merge pull request #390 from Bone-White/master
Removed two debug comments
2014-08-16 20:52:30 -04:00
Bone White
866db87ec0 Removed two debug comments 2014-08-17 00:43:54 +01:00
ZomgPonies
2cfe8a8765 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-08-16 18:12:53 -04:00
ZomgPonies
bdb35c7b3a MySQL fixes 2014-08-16 18:12:44 -04:00
ZomgPonies
24b78b69be Use absolute paths next time 2014-08-16 18:11:49 -04: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
iamgoofball
4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07: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
baa349c407 slightly increased syndicate rigs slow 2014-08-13 01:27:13 +01: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
2feedafaae Merge pull request #375 from VampyrBytes/master
couple of fixes
2014-08-11 20:38:11 -04:00
ZomgPonies
65af681dad Merge pull request #370 from Regory/tajaran-spawn-gloves
Better Racial Item Spawns
2014-08-11 20:37:02 -04:00
W3bster
b66e875830 Map changes. Compile fix.
-Fixed the compile error.
-Magistrate's office, linked with IAA's office.
-Clown's office.
-Mime's office.
-Central Command ERT quarters.
-Central DS Spawn Area.
-White gloves for the fancy NT rep.
-Fancy pen for the Fancy NT rep.
-Added cameras in surgery and recovery wards
-Fixed maintenance area missing
-Central Command can no longer be blown open
-Fixed Robotics maintenance pipes, cables, waste pipes missing.
-Added chair and swiper in NT rep.
-Added chair and swiper in blueshield.
-Added swiper in the bridge.
-Added chair and additional security at NT rec.
-More water tanks in maintenance for firefighting
-Light in the PDA server room near the AI.
-Fixed security's mulebot flaps
2014-08-11 01:51:34 -04:00
IcyV
f7e6f57a63 Allows for the antimov core to be created in research.
Requires high and illegal research to reach, allows antimov modules to be created.
2014-08-10 19:44:18 -07:00
IcyV
93f3f7b5ed Chem and overdose patch.
Raises general overdose amounts. Lowers brute/burn damage from overdose. Removes the secondary anit-tox.
2014-08-10 03:16:32 -07:00
VampyrBytes
896021c967 couple of fixes
fixes MP's ending up with 2 heads on death
fixes cloning machine cloning species that are meant to be uncloneable
2014-08-10 11:11:21 +01:00
Regory
f8ed5bf6b6 Sync Changes from Paradise Master
Sync changes
2014-08-09 18:48:19 -04:00
Regory
c497d8e1a9 Tajaran and Unathi shoes
Stops Tajarans and Unathi from wearing sandals if they are a cyborg (no
feet) or a clown (clowns have large shoes)
2014-08-09 18:41:40 -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