9c97c44091
Merge pull request #598 from SamCroswell/NinjaDev
...
Pathing Fixes
2015-03-18 22:45:59 +01:00
c71b4c4f26
Pathing Fixes
...
Fixes a pathing issue with katans and hyposprays.
2015-03-18 17:22:15 -04:00
ba98e33b66
Proper Bible Farting
2015-03-17 19:40:46 -04:00
d0a09c8126
Mindslave, Loyalty, and Knockdown fixes.
2015-03-17 14:01:36 -04:00
000ec34d97
New sounds for Machine People/Robotic Hearts/Assissted Hearts
2015-03-17 18:39:42 +01:00
008cf4d365
Adds pref SOUND_HEARTBEAT
2015-03-17 17:30:28 +01:00
07e9b18f6c
Compile and Runtime fixes.
2015-03-17 15:35:47 +01:00
c599d4ce7b
Additional checks for heartbeat, reduced volume
2015-03-17 15:17:15 +01:00
303a52fdfa
Port Heartbeat from Baystation12( #8386 )
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-03-17 15:13:38 +01:00
05d09a4c5a
Merge pull request #581 from tigercat2000/TajaEatMice
...
Let Tajaran eat mice!
2015-03-17 08:24:01 -04:00
ad4135e170
Merge pull request #580 from Fox-McCloud/Explosions
...
Explosion Tweaks and Fixes
2015-03-17 08:22:15 -04:00
d3faf75a4d
Changes.
2015-03-17 05:27:05 -04:00
1cb3e38b65
Update saw-off code
2015-03-16 19:36:40 +01:00
abd7e00ab0
Photocopier fix
2015-03-16 18:56:51 +01:00
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
e8fb990a5b
Properly integrate and stoof
2015-03-16 03:11:22 +01:00
6d594204a3
Let Tajaran eat mice!
2015-03-16 02:53:56 +01:00
554ad70699
Dead Gibbing
2015-03-15 20:09:43 -04:00
645167b49a
Explosion Tweaks and Fixes
2015-03-15 18:05:13 -04:00
b001107a3c
Merge pull request #579 from TheDZD/changeling
...
Minor Fixes
2015-03-15 16:59:00 -04:00
a31cdc9091
Merge pull request #572 from SamCroswell/NinjaDev
...
Ninja Restructure
2015-03-15 16:58:41 -04:00
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
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
c693be1c57
Merge pull request #548 from tigercat2000/SlimeColorChanger
...
Allows slime people to change color in lobby.
2015-03-11 16:53:29 -04:00
7da4efc494
Fix proc/update_preview_icon as well as ID images for colored slime people
2015-03-11 16:18:34 +01:00
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
7f239d6dbc
Merge pull request #551 from ZomgPonies/random
...
No more randomly weird colored species
2015-03-09 23:26:17 -04:00
d1587addaf
No more crazy random colors
2015-03-09 22:32:14 -04:00
addfbe449e
Adds Shuriken
2015-03-09 21:28:28 -04:00
1c88cec5b1
Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger
2015-03-09 22:25:35 +01:00
4d1c80b7d9
Merge pull request #535 from FalseIncarnate/master
...
Kitchen Overhaul
2015-03-09 13:40:49 -04:00
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
8477d382a7
Merge conflict Fix
...
Conflicts:
icons/mob/suit.dmi
2015-03-08 20:38:07 -04:00
3745513c78
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-08 20:33:55 -04:00
7fda1b1fd5
Merge pull request #539 from ZomgPonies/plasma
...
Plasmamen Softsuit Fixes
2015-03-08 20:31:44 -04:00
e4a5190188
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-08 20:29:07 -04:00
355eca1d26
Remove pressure resistance values
2015-03-08 20:26:10 -04:00
89f2aea30d
Insulated Gloves Fix
2015-03-08 19:12:35 -04:00
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
479fb500ba
Some more plasmamen eva suit bugs
2015-03-08 17:34:32 -04:00
8829a90709
NT Rep + Blueshield Uniform Change
2015-03-08 16:59:01 -04:00
e45aea4d2f
Added karma jobs to custom softsuits
2015-03-08 16:08:36 -04:00
5bb63a7f63
Merge Conflict Resolution
...
Conflicts:
icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -04:00
1848926a32
Oops hurr durr
2015-03-08 15:55:01 -04:00
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
71c344013e
Merge pull request #518 from ZomgPonies/plasma
...
Adds Plasmaman to Karma Shop
2015-03-08 20:02:16 +01:00
e82442b831
No special language for now.
2015-03-08 14:37:47 -04:00
b573472e55
Adds missing spacesuits to plasmamen
2015-03-08 14:34:39 -04:00
80a560d291
Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4
2015-03-08 19:05:36 +01:00
b8b0fd13b8
Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/response_team.dm
maps/cyberiad.dmm
2015-03-08 18:54:13 +01:00
Mark van Alphen