Markolie
12aaa6a93e
Bug fixes
2015-03-17 16:16:44 +01:00
Markolie
1cb3e38b65
Update saw-off code
2015-03-16 19:36:40 +01:00
Markolie
abd7e00ab0
Photocopier fix
2015-03-16 18:56:51 +01:00
Markolie
23bae14e9c
Fix monkeys picking up intercoms
2015-03-16 18:52:33 +01:00
Markolie
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
Fox-McCloud
d266436143
Merge pull request #570 from tigercat2000/NanoUIPool
...
NanoUI for Pool-Controller! (never again)
2015-03-15 16:59:30 -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
Tigercat2000
e0f2c1ac78
Fix according to MarkvA's comments
2015-03-12 21:55:20 +01:00
Tigercat2000
811bf57d22
NanoUI for Pool-Controller! (never again)
2015-03-12 19:51:27 +01:00
ZomgPonies
f7c1fe8229
Hurr durr derpydidurr
2015-03-11 23:35:15 -04:00
ZomgPonies
adb54f4a06
Cryopod fixes
2015-03-11 18:08:01 -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
b3c5963e3e
Fix weirdness with datacore rendering HAS_SKIN_COLOR races as default
...
color
2015-03-11 17:24:04 +01: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
Mark van Alphen
bee7dc659b
Merge pull request #550 from ZomgPonies/master
...
Blueshield Balance Changes
2015-03-11 14:26:14 +01:00
Mark van Alphen
9fa5faafab
Merge pull request #552 from ZomgPonies/table
...
Balancing out tableclimbing
2015-03-11 14:26:04 +01:00
ZomgPonies
25d79df91a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-10 18:29:57 -04:00
FalseIncarnate
1f9c11b194
Kitchen Overhaul Fixes
...
Fixes all cotton candy flavors/colors utilizing the plain version's
sprite.
Fixes fixing kitchen machines (candy maker, grill, oven, microwave) with
a wrench attempting to unfasten/refasten them to the ground. You can
only unfasten these machines if they are not broken now.
2015-03-10 01:50:30 -04:00
ZomgPonies
fe2ffc16de
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-09 23:51:01 -04:00
Fox-McCloud
7f239d6dbc
Merge pull request #551 from ZomgPonies/random
...
No more randomly weird colored species
2015-03-09 23:26:17 -04:00
ZomgPonies
66dd040130
Gives the ability to stop someone climbing a table
2015-03-09 22:55:30 -04:00
ZomgPonies
d1587addaf
No more crazy random colors
2015-03-09 22:32:14 -04:00
SamCroswell
addfbe449e
Adds Shuriken
2015-03-09 21:28:28 -04:00
ZomgPonies
b51850dfdd
Blueshield access change
2015-03-09 19:01:42 -04:00
Tigercat2000
e0582bbd46
Revert global.dm changes, didn't mean to commit them
2015-03-09 22:56:01 +01:00
Tigercat2000
1c88cec5b1
Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger
2015-03-09 22:25:35 +01:00
Tigercat2000
ec8a35d544
Pool fixes, sanity checks.
...
Updates pool code so that it doesn't affect ghosts, AI eyes, and silicone,
also changes the message to only display on prob(50), to cut down on the
message spam
2015-03-09 19:40:43 +01:00
ZomgPonies
4d1c80b7d9
Merge pull request #535 from FalseIncarnate/master
...
Kitchen Overhaul
2015-03-09 13:40:49 -04:00
FalseIncarnate
69defb6f29
Kitchen Overhaul Map Edit
...
Replaces the Cereal Maker with the Candy Maker.
Replaces the old Grill with the new Grill.
Replaces the old Oven with the new Oven.
Also gives the Candy Maker a description that isn't a copy-paste from
the Cereal Maker (whoops).
2015-03-08 21:11:14 -04:00
SamCroswell
65b530fbe6
Locker Fix - Part Zwei
2015-03-08 21:01:01 -04:00
SamCroswell
03a13fca3a
Locker Fix
2015-03-08 20:53:47 -04:00
SamCroswell
8477d382a7
Merge conflict Fix
...
Conflicts:
icons/mob/suit.dmi
2015-03-08 20:38:07 -04:00
FalseIncarnate
3745513c78
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-08 20:33:55 -04:00
Fox-McCloud
7fda1b1fd5
Merge pull request #539 from ZomgPonies/plasma
...
Plasmamen Softsuit Fixes
2015-03-08 20:31:44 -04:00
FalseIncarnate
e4a5190188
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-08 20:29:07 -04:00
ZomgPonies
355eca1d26
Remove pressure resistance values
2015-03-08 20:26:10 -04:00
Fox-McCloud
89f2aea30d
Insulated Gloves Fix
2015-03-08 19:12:35 -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
753d23c667
Fix type that screwed with removing plasma suits
2015-03-08 17:43:17 -04:00
ZomgPonies
479fb500ba
Some more plasmamen eva suit bugs
2015-03-08 17:34:32 -04:00
SamCroswell
8829a90709
NT Rep + Blueshield Uniform Change
2015-03-08 16:59:01 -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
Markolie
c09c27958a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
maps/cyberiad.dmm
2015-03-08 20:10:49 +01: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
