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
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
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
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
alex-gh
808e908dc6
Merge pull request #365 from Artorp/chemisty-changes
...
Chemisty quality-of-life changes
2014-08-09 22:34:54 +02: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
Artorp
32d14b8307
Medical belt can load into fridge
...
- Fixed compiling error with glass.dm
- Medical belt will load apropriate items into the medical fridge when
used on the fridge
2014-08-09 03:18:31 +02:00
Artorp
4c59644d95
Enable medical belt quick pickup
...
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
2014-08-09 02:51:15 +02: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
a812f3896c
Vampyr, ya dun fucked up. Test your commits next time.
2014-08-07 20:19:42 -04:00
ZomgPonies
852f89dd0b
Merge pull request #362 from VampyrBytes/master
...
fix for #248 number 2
2014-08-07 03:51:24 -04:00
ZomgPonies
e4d2cb53e4
Merge pull request #359 from Bone-White/master
...
Rubber bullets now cause agony/halloss instead of stun
2014-08-06 19:04:35 -04: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
Bone White
f63a1995b8
Rubber bullets now cause agony/halloss instead of stun
...
As title, by Mel's request. Makes sense with the stunbaton nerf to nerf
rubber bullets too. Two shots cause incapacitation (as opposed to three
from a taser).
2014-08-06 20:41:31 +01:00
VampyrBytes
8504a13e33
fix for #248 number 2
...
Last fix didn't work, this one should though
2014-08-06 08:06:41 +01:00
ZomgPonies
415013ef22
Merge pull request #357 from VampyrBytes/master
...
fix for #248
2014-08-06 01:34:20 -04:00
ZomgPonies
d388e0b069
Merge pull request #356 from Regory/scoreboard-mining
...
Scoreboard mining
2014-08-06 01:33:46 -04:00
ZomgPonies
5b04ef3385
Merge pull request #355 from Bone-White/master
...
Pipe wall drilling fix
2014-08-05 20:34:01 -04:00
Bone White
3c4db5076a
Better adminlogs for virus mutations in mobs
2014-08-05 22:46:38 +01:00
Bone White
dc2bf43c11
Added adminlog to virus mutations in mobs
2014-08-05 22:39:15 +01:00
