tigercat2000
48d78b4648
Merge pull request #7832 from Fox-McCloud/lungsss
...
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
Fox-McCloud
b1e729e1dd
lung specific damage behavior
2017-11-18 19:29:58 -05:00
Fox-McCloud
6ec234430e
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
# code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
uraniummeltdown
7ed2c68ea7
compiles, find and replace particle_effect and effect_system
2017-11-04 20:16:01 +04:00
Aurorablade
0aaaf3a11c
THESE WOUNDS THEY WILL NOT HEAL
2017-10-15 22:26:34 -04:00
TDSSS
1e7575afde
Adjusted ghetto surgery tool chances to keep ghetto surgery chances overall roughly equal. Also added rigsuit removal to list of surgeries that don't care about pain.
2017-10-15 15:28:25 -07:00
TDSSS
897e201775
Started on surgery stuff
...
Adds pain modifier to surgery if patient is conscious
Now actually compiles
Makes surgery easier if patient is drunk, allowing for easier ghetto surgery.
Now reduces failure chance if painkillers are in the patient's system.
Fixed argument spacing (hopefully)
Repairing robotic limbs no longer needs anesthesia.
Revert "Repairing robotic limbs no longer needs anesthesia."
This reverts commit 12c1f4140a
2017-10-15 15:28:13 -07:00
tigercat2000
b316f484e6
Merge pull request #7609 from Vivalas/splint_nerf
...
Makes surgery great again (nerfs splints)
2017-10-15 14:00:17 -07:00
Vivalas
f202816c71
Now look at this [src.name], that I just found....
...
When I say go, be ready to throw!
....
IT'S [name] NOT [src.name]!! Aagh, Let's try something else...
2017-09-17 17:54:53 -05:00
Vivalas
891895f467
SPAN ME UP
...
SPAN ME UP INSIDE!!!!
I CAN'T SPAN UP
SAVEEEEE MEEEEEEEEE
2017-09-17 17:46:27 -05:00
Fox-McCloud
003277a89d
Merge remote-tracking branch 'upstream/master' into lungsss
2017-09-17 01:02:33 -04:00
Vivalas
3443b57e0a
qdel Destroy() fix
2017-09-16 14:19:59 -05:00
Vivalas
0a6fe18e77
Hurrah! It compiles
2017-09-09 19:55:49 -05:00
Vivalas
4fb6c0365e
Merge remote-tracking branch 'upstream/master' into splint_nerf
2017-09-09 19:21:33 -05:00
Aurorablade
df3d13ad7d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
2017-09-02 22:49:05 -04:00
Aurorablade
9956a4a90a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
2017-08-23 17:37:22 -04:00
Fox-McCloud
6a24d8bc02
Fixes Bloodless Internal Bleeding
2017-08-22 17:25:27 -04:00
Fox-McCloud
4479185d6e
Merge remote-tracking branch 'upstream/master' into lungsss
2017-08-16 19:20:19 -04:00
Fox-McCloud
cf4735a069
Merge remote-tracking branch 'upstream/master' into HUNKE
2017-08-16 18:36:30 -04:00
tigercat2000
ebabda1223
Merge pull request #7366 from KasparoVy/mob_rgb_to_hex
...
Converts Mob Colours to Hexadecimal
2017-08-16 12:52:13 -07:00
Aurorablade
46b99794b0
Surgery Fix
2017-08-14 18:50:58 -04:00
Vivalas
dc0a008fe2
Merge branch 'master' into splint_nerf
2017-08-13 23:13:24 -05:00
Fox-McCloud
9d14e6c9da
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/life.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station.dm
# code/modules/surgery/surgery.dm
2017-08-05 19:03:52 -04:00
Fox-McCloud
5443a3f6d3
Fixes Fox Being A Moron
2017-08-03 00:30:56 -04:00
Crazy Lemon
5d85b6697c
Merge pull request #7870 from Fox-McCloud/tweaks/fixes/organ/stuff
...
Various little fixes/refactors
2017-08-01 21:41:13 -07:00
Aurorablade
8e5f3102ff
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
2017-07-31 17:20:30 -04:00
Fox-McCloud
0f168fab4e
multiplication memes
2017-07-25 15:40:56 -04:00
Fox-McCloud
81d3acb6d6
Merge remote-tracking branch 'upstream/master' into removes-cryobags
2017-07-25 15:21:28 -04:00
Fox-McCloud
b34c14739b
Various little fixes/refactors
2017-07-25 08:15:25 -04:00
Fox-McCloud
211038b6c7
Fixes Infections in Organs from Cloning
2017-07-23 18:19:23 -04:00
KasparoVy
a6bb591b46
Converts Mob Colours to Hexadecimal
...
No front-end changes. This just means that mob colours now take up less columns in the database, incur less processing (reduced rgb() calls) and reduces the amount of code dedicated to them.
2017-07-22 19:59:58 -04:00
Crazy Lemon
6a4e69f741
Merge pull request #7845 from Fox-McCloud/organsss
...
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloud
7cda52c713
Merge pull request #7818 from Crazylemon64/item_stumbling
...
Item stumbling refactor
2017-07-22 01:55:19 -04:00
Fox McCloud
b37c1cf4e7
Merge pull request #7814 from Crazylemon64/many_fixes
...
Runtime killer v2
2017-07-22 00:39:10 -04:00
Fox-McCloud
1ecd7f13fc
instant updates
2017-07-21 02:19:12 -04:00
Fox-McCloud
02f74932e2
Fixes IPC and Diona Knockdown Immunity
2017-07-20 21:01:55 -04:00
tigercat2000
e0dad32b50
Merge pull request #7806 from Fox-McCloud/FUCK-YOUR-CUNT-YOU-SHIT-EATING-CUNT-TILL-YOU-ARE-A-MASS-EATING-SHIT-CUNT-EAT-PENISES-IN-YOUR-FUCK-FACE-AND-SHIT-OUT-ABORTIONS-TO-FUCK-UP-SHIT-IN-YOUR-ASS-YOU-COCK-FUCK-SHIT
...
Removes Bay's Wound System
2017-07-19 14:13:49 -07:00
Fox-McCloud
87e429b18e
derp
2017-07-19 15:55:29 -04:00
Fox-McCloud
469c5706a6
break off crit damage
2017-07-19 12:23:31 -04:00
Fox-McCloud
b236225f78
alerts fix
2017-07-19 11:49:48 -04:00
Fox-McCloud
6cdcdf42f9
forgot this
2017-07-19 04:23:29 -04:00
Fox-McCloud
77375fc1c4
Breathing is Now Handled on Lungs
2017-07-19 03:28:21 -04:00
Fox-McCloud
5bba6c70f7
Limits BLood Volume to 560
2017-07-18 00:10:43 -04:00
Crazylemon64
a8e7716649
Refactors slipping to be completely general for items
2017-07-16 19:20:55 -07:00
Crazylemon64
3a00e0f083
Fixes for numerous runtimes
2017-07-16 14:42:11 -07:00
Fox-McCloud
2c4952b803
finally
2017-07-16 04:07:54 -04:00
Fox-McCloud
d37d18e660
kill it dead
2017-07-15 23:51:53 -04:00
Fox-McCloud
93abbe25a4
BURNNNNNNN
2017-07-15 23:43:51 -04:00
Fox-McCloud
cb35d1f6e9
Binsult.ogg
2017-07-15 12:12:59 -04:00
Fox-McCloud
3deaf6ece8
Merge remote-tracking branch 'upstream/master' into removes-cryobags
2017-07-15 06:20:26 -04:00
