ZomgPonies
05d09a4c5a
Merge pull request #581 from tigercat2000/TajaEatMice
...
Let Tajaran eat mice!
2015-03-17 08:24:01 -04:00
ZomgPonies
ad4135e170
Merge pull request #580 from Fox-McCloud/Explosions
...
Explosion Tweaks and Fixes
2015-03-17 08:22:15 -04:00
Fox-McCloud
d3faf75a4d
Changes.
2015-03-17 05:27:05 -04:00
Markolie
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
Tigercat2000
e8fb990a5b
Properly integrate and stoof
2015-03-16 03:11:22 +01:00
Tigercat2000
6d594204a3
Let Tajaran eat mice!
2015-03-16 02:53:56 +01:00
Fox-McCloud
554ad70699
Dead Gibbing
2015-03-15 20:09:43 -04:00
Fox-McCloud
645167b49a
Explosion Tweaks and Fixes
2015-03-15 18:05:13 -04:00
Fox-McCloud
b001107a3c
Merge pull request #579 from TheDZD/changeling
...
Minor Fixes
2015-03-15 16:59:00 -04:00
Fox-McCloud
a31cdc9091
Merge pull request #572 from SamCroswell/NinjaDev
...
Ninja Restructure
2015-03-15 16:58:41 -04:00
DZD
f5fd826e55
Minor Fixes
...
- Fixes xeno sentinel and hunter health HUDs, forgot to update these
when I changed their health.
- Changeling regen stasis renders the changeling unconscious and blind.
2015-03-15 13:18:27 -04:00
SamCroswell
62ae69c816
Ninja File Structure Rework
...
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.
Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
ZomgPonies
c693be1c57
Merge pull request #548 from tigercat2000/SlimeColorChanger
...
Allows slime people to change color in lobby.
2015-03-11 16:53:29 -04:00
Tigercat2000
7da4efc494
Fix proc/update_preview_icon as well as ID images for colored slime people
2015-03-11 16:18:34 +01:00
ZomgPonies
d1587addaf
No more crazy random colors
2015-03-09 22:32:14 -04:00
Fox-McCloud
7fda1b1fd5
Merge pull request #539 from ZomgPonies/plasma
...
Plasmamen Softsuit Fixes
2015-03-08 20:31:44 -04:00
ZomgPonies
00902cf5a7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plasma
...
Conflicts:
icons/mob/suit.dmi
2015-03-08 17:47:32 -04:00
ZomgPonies
479fb500ba
Some more plasmamen eva suit bugs
2015-03-08 17:34:32 -04:00
ZomgPonies
e45aea4d2f
Added karma jobs to custom softsuits
2015-03-08 16:08:36 -04:00
SamCroswell
5bb63a7f63
Merge Conflict Resolution
...
Conflicts:
icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -04:00
ZomgPonies
1848926a32
Oops hurr durr
2015-03-08 15:55:01 -04:00
Mark van Alphen
71c344013e
Merge pull request #518 from ZomgPonies/plasma
...
Adds Plasmaman to Karma Shop
2015-03-08 20:02:16 +01:00
ZomgPonies
e82442b831
No special language for now.
2015-03-08 14:37:47 -04:00
ZomgPonies
b573472e55
Adds missing spacesuits to plasmamen
2015-03-08 14:34:39 -04:00
ZomgPonies
9a21ce5fef
Merge pull request #529 from Fox-McCloud/Crayons
...
Crayons and Gloves
2015-03-08 13:24:05 -04:00
ZomgPonies
9e57d2424f
Merge pull request #528 from TheDZD/nano_pai
...
NanoUI pAIs
2015-03-08 13:23:05 -04:00
SamCroswell
723044ebc6
Ninja icons addition, glasses code tweak
2015-03-07 10:31:56 -05:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
DZD
922cd08fd5
Removes 2 lines that do nothing.
2015-03-06 19:56:40 -05:00
DZD
d2d0627d43
NanoUI pAIs
2015-03-06 18:34:45 -05:00
ZomgPonies
8c34221110
Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix
...
Fixes
2015-03-06 12:55:24 -05:00
ZomgPonies
17a9e38439
Merge pull request #511 from Fox-McCloud/Life-Proc-Work
...
Life Proc Changes--Cold Space and and Temp Handling
2015-03-06 12:54:42 -05:00
Fox-McCloud
0c751dc7f6
Xeno attack borg fix
2015-03-06 07:20:57 -05:00
Fox-McCloud
a74bb8a710
Fire Fixes
2015-03-05 20:30:18 -05:00
Fox-McCloud
0ffe412121
Pressure protection
2015-03-05 18:33:18 -05:00
SamCroswell
5fac18862e
Fixes Nightvision Glasses
...
Nightvision glasses no longer have a snowflake check, instead all
glasses have a see_darkness variable that determines if they see the
darkness overlay.
2015-03-05 18:25:20 -05:00
ZomgPonies
c942b5e60c
Adds Plasmaman to Karma Shop
2015-03-05 14:35:17 -05:00
ZomgPonies
0fd3cdfb33
Fixing the SSD infinite sleep bug
2015-03-05 13:34:01 -05:00
ZomgPonies
646ef4563e
Removed old snowflake bloodcode references
2015-03-04 12:24:47 -05:00
ZomgPonies
13aeecf33c
Removed some blood flags, added blood color to greys and kidan
2015-03-04 12:17:14 -05:00
ZomgPonies
bc900d678a
Merge pull request #512 from Markolie/master
...
Fix player panel, other fixes
2015-03-04 10:23:36 -05:00
Markolie
6352d2abd9
Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix
2015-03-04 15:09:12 +01:00
Markolie
691fef1ff0
Fix player panel
2015-03-04 14:47:45 +01:00
Fox-McCloud
2548b838cf
fix
2015-03-04 06:22:18 -05:00
Fox-McCloud
a911b53e8b
Life Proc Changes--Cold Space and and Temp Handling
2015-03-04 05:42:12 -05:00
Fox-McCloud
5cad8fe41e
Merge pull request #500 from ZomgPonies/blood
...
Proper colored blood
2015-03-04 00:24:53 -05:00
ZomgPonies
3fec57ed8f
Merge pull request #494 from Fox-McCloud/Cyborg-Balance
...
Cyborg Rebalance
2015-03-04 00:15:15 -05:00
ZomgPonies
463204c913
Merge pull request #493 from Markolie/master
...
NanoUI synth airlock control, ERT equipment rework, fixes
2015-03-03 21:28:22 -05:00
ZomgPonies
10ee512d22
Merge pull request #492 from SamCroswell/dave-NinjaDev
...
Removes Space Ninjas
2015-03-03 21:26:16 -05:00
Markolie
3497d4ba9e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-03-03 22:58:41 +01:00
