Mark van Alphen
f8605bd406
Merge pull request #608 from Fox-McCloud/Temporary-Fires
...
New Feature: Temporary Fires, Napalm Rework, and Dragon's Breath Round Fix
2015-03-23 15:38:28 +01:00
Fox-McCloud
9f59b20303
Merge pull request #624 from Artorp/meat
...
Fixes meat harvesting of some simple_animals
2015-03-22 17:59:48 -04:00
Fox-McCloud
2d4f754edb
Merge pull request #628 from tigercat2000/FixStatueClick
...
Add clickdelay to attacking statues & lights
2015-03-22 17:59:00 -04:00
Tigercat2000
7b84658a33
Fix giving things to non-carbons
2015-03-22 19:50:55 +01:00
Tigercat2000
86f8ed5111
Fixes related issue with spamclicking lights
2015-03-22 18:36:54 +01:00
Artorp
e7434672bc
Fixes meat harvesting of some simple_animals
2015-03-22 05:08:32 +01:00
Artorp
fc45243f8a
Bugfixes
...
- Disables random events by default, requires config.txt to enable
random events
- Makes portable turrets respect its preset anchored value
- Gives flamethrower a real category
2015-03-21 13:39:00 +01:00
Fox-McCloud
9749c04d15
Merge pull request #605 from FalseIncarnate/master
...
Grape Juice
2015-03-21 01:58:02 -04:00
Fox-McCloud
ba28d8e5b3
Incendiary Grenade
2015-03-20 17:02:22 -04:00
Mark van Alphen
a50db87e12
Merge pull request #609 from Fox-McCloud/Xeno-Temp
...
Xeno Space Fix
2015-03-20 21:30:30 +01:00
Fox-McCloud
3d89f8707c
Xeno Space Fix
2015-03-20 16:10:11 -04:00
Fox-McCloud
094b6e506e
Dragon's Breath Fix
2015-03-20 15:33:27 -04:00
FalseIncarnate
0541f7c3c8
Grape Juice
...
Re-adds grape juice to the game.
- Adds Grapel Juice to the vending machine.
- Get your purple cans for 20 credits.
- Adds Grape Juice to the bar's soda fountain.
- Adds the ability to juice grapes into Grape Juice.
This makes purple candies possible, and who doesn't want to fill their
cup with PURPLE DRANK.
2015-03-20 00:24:23 -04:00
Fox-McCloud
38adfe06a0
Removes Recursive Explosions
2015-03-19 03:23:14 -04:00
ZomgPonies
8baa1e4ba9
Merge pull request #595 from Fox-McCloud/Bible-Farting
...
Proper Bible Farting
2015-03-19 01:42:19 -04:00
ZomgPonies
bfb1969279
Merge pull request #592 from Fox-McCloud/mindslave-loyalties
...
Mindslave, Loyalty, and Knockdown fixes.
2015-03-19 01:41:51 -04:00
ZomgPonies
ab619f66ee
Merge pull request #590 from tigercat2000/HeartBeatPort
...
Heartbeat sound port from Baystation12/Baystation12#8386
2015-03-19 01:41:33 -04:00
Mark van Alphen
9c97c44091
Merge pull request #598 from SamCroswell/NinjaDev
...
Pathing Fixes
2015-03-18 22:45:59 +01:00
SamCroswell
c71b4c4f26
Pathing Fixes
...
Fixes a pathing issue with katans and hyposprays.
2015-03-18 17:22:15 -04:00
Fox-McCloud
ba98e33b66
Proper Bible Farting
2015-03-17 19:40:46 -04:00
Fox-McCloud
d0a09c8126
Mindslave, Loyalty, and Knockdown fixes.
2015-03-17 14:01:36 -04:00
Tigercat2000
000ec34d97
New sounds for Machine People/Robotic Hearts/Assissted Hearts
2015-03-17 18:39:42 +01:00
Tigercat2000
008cf4d365
Adds pref SOUND_HEARTBEAT
2015-03-17 17:30:28 +01:00
Tigercat2000
07e9b18f6c
Compile and Runtime fixes.
2015-03-17 15:35:47 +01:00
volas
c599d4ce7b
Additional checks for heartbeat, reduced volume
2015-03-17 15:17:15 +01:00
volas
303a52fdfa
Port Heartbeat from Baystation12( #8386 )
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-03-17 15:13:38 +01:00
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
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
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
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
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
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
Tigercat2000
1c88cec5b1
Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger
2015-03-09 22:25:35 +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
8477d382a7
Merge conflict Fix
...
Conflicts:
icons/mob/suit.dmi
2015-03-08 20:38:07 -04:00
