Commit Graph

15497 Commits

Author SHA1 Message Date
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
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
ZomgPonies
0ee915abeb Merge pull request #602 from Fox-McCloud/Recursive-Explosions
Removes Recursive Explosions
2015-03-20 02:58:54 -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
43456a5934 Merge pull request #600 from tigercat2000/GibberRefactor
Gibber Refactor as (kindof) per Baystation12/Baystation12#7510
2015-03-19 23:37:32 -04:00
Fox-McCloud
b97d79fa02 Merge pull request #599 from TheDZD/plasma-structures
Removes plasma mineral doors burning
2015-03-19 23:36:46 -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
ab963bdb10 Merge pull request #594 from Fox-McCloud/Overcharged-Flash
Overcharged Flash
2015-03-19 01:42:03 -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
ZomgPonies
3fc1941a14 Merge pull request #588 from Fox-McCloud/Implants
Implant Cleanup
2015-03-19 01:41:18 -04:00
Tigercat2000
1191fb912e Gibber Refactor/Mousedrop/LayerHandling/AutogibberFix 2015-03-19 03:17:38 +01:00
DZD
f81848033f Comments out plasma mineral doors burning 2015-03-18 22:15:41 -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
Markolie
74724e6936 Radio uplink refund fix 2015-03-17 22:54:21 +01:00
Fox-McCloud
2b33c18bfe Overcharged Flash 2015-03-17 17:10:24 -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
Markolie
83e2a4cea1 Cryopod update 2015-03-17 16:33:09 +01:00
Markolie
747c2f9a57 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/turfs/simulated/floor.dm
2015-03-17 16:18:42 +01:00
Markolie
12aaa6a93e Bug fixes 2015-03-17 16:16:44 +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
09d8e839ef Merge pull request #582 from Fox-McCloud/Escape-Pods
Escape Pod Fixes and Tweaks
2015-03-17 08:29:40 -04: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
9fef88f347 Implant Cleanup 2015-03-17 06:30:54 -04:00
Fox-McCloud
d3faf75a4d Changes. 2015-03-17 05:27:05 -04:00
ZomgPonies
854fd74622 Merge pull request #578 from tigercat2000/SpacePodEMP
EMP_Act for spacepods, disables movement, eats cell charge, largely
2015-03-16 18:38:18 -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
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
604b4bb28a Escape Pod Fixes 2015-03-16 02:18:35 -04: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
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
Tigercat2000
47d5fbaa4d Optimizing code, WIP 2015-03-15 20:55:47 +01: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