cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 08:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,189 Commits 26 Branches 2 Tags
58a76e75348fb2ccac13d864af10d2c58faade40
Commit Graph

8081 Commits

Author SHA1 Message Date
PJB3005
e5e9013ab4 make bananium smeltable 
exactly as the title says, though, the smelter menu calls it 'clown',
because the oretag is clown, didn't fix it, because i dont know what
things use the oretag variable(i know some), and didn't want to break
anything over such a small bug
 2014-09-24 15:15:56 +02:00
Bone White
09a0eee875 Fix for hardsuit modifications 
When suits are turned to tajaran or unathi types, any helmets on the
suit are put on the floor.
 2014-09-14 20:25:50 +01:00
Bone White
d81a87363e Fix for Ryetalin 
Cures on a chance based on volume of ryetalin injected, on_mob_life.
TURNS OFF ALL MUTATIONS!!

// 1 volume = ~2% chance
// 10 volume = ~17% chance
// 30 volume = ~38% chance

Returns SE to mob creation values (now set in dna2.dm)
 2014-09-14 11:39:52 +01:00
Bone White
2edff42431 Wubbledaddy's Pennywise costume fix 2014-09-08 04:46:58 +01:00
Bone White
e836d6abdf Added new black surgical scrubs 
Potentially for new mortician job.  Sprited by Pancake.
 2014-09-08 02:46:24 +01:00
Bone-White
9c6efcf5b5 Merge pull request #5 from ZomgPonies/master 
Downstream update
 2014-09-07 20:53:37 +01:00
Bone White
b401ee3cc8 Fix for npc xeno screaming whilst dead 2014-09-07 17:37:17 +01:00
Necaladun
2f3caa9b0c Pennywise items, disposal fix 2014-09-03 09:44:45 +09:30
VampB
ba5744ba9e Fixes UI error 
Fixes the current issue of equiping items in the UI slots
 2014-09-02 16:04:07 +01:00
melandor0
59f73acfd3 Traitorstation Fixes + SyndieCat 
Fixes some things with traitorstation and adds SyndieCat.
 2014-09-02 13:53:11 +02:00
Necaladun
40c5e5ddaf Donator Item 
Purple beret fluff item for a donator
 2014-08-31 12:01:31 +09:30
ZomgPonies
434c67d66c Merge pull request #400 from IndexLP/master 
Hostile Environments Reblance
 2014-08-30 07:30:06 -04:00
ZomgPonies
cfc8cd398a Merge pull request #407 from Regory/quick-fixes 
Fix for making Dough Slices
 2014-08-30 07:29:32 -04:00
Bone White
56bef314b7 EVA changes exploit fix 
quick-equip (hotkey equip) now has the same delay/restriction as normal
equipping eva suits/helms
 2014-08-28 17:07:39 +01:00
Bone White
e964c45f00 Removed uncommented code 
was causing a problem with eva helm equipping
 2014-08-28 15:34:31 +01:00
Regory
a9f35a41fb Changed ..() 
For readability.
 2014-08-23 16:55:30 -04:00
Regory
0f0153915c Fixed and Tested Flat Dough Bugfix 
Tested.  Flat dough makes dough slices when cut with knife.
 2014-08-23 13:53:55 -04:00
IndexLP
33be2a8e76 Moves try_rupture_lung() to Human.DM next to the code for rupturing a lung, and makes it a proc for mob/living/carbon/human 2014-08-21 18:39:12 -04:00
IndexLP
aaefe4eaa4 Merge remote-tracking branch 'upstream/master' 2014-08-21 18:34:03 -04:00
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
Regory
64795c0351 Flat Dough + Kitchen Knife = Dough Slice 
Fixes flat dough so that kitchen knives make Dough Slices instead of
Kitchen Knife Personal Pizza.

NOT YET TESTED
 2014-08-20 20:47:31 -04: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
IndexLP
29caac4512 Hostile Environments Reblance- 
Low presssure areas made less deadly
Open space made more deadly
 2014-08-20 03:18:31 -04: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