Markolie
24626bc081
Testing lab changes
2015-03-21 16:18:42 +01:00
Markolie
3c8ca1fafd
Fix admin radio chat preference applying to non-admins
2015-03-21 15:38:20 +01:00
Mark van Alphen
b5b4d6f178
Merge pull request #604 from Fox-McCloud/Science-Job
...
Science Job Homogenization and Test Lab
2015-03-21 14:06:03 +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
01fa55adda
Test Lab
2015-03-20 07:11:30 -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
ff2ef502d4
Science Job Homogenization
2015-03-19 20:01:02 -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
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
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
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
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
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
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
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
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
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
Tigercat2000
0ab1a02ac8
EMP_Act for spacepods, disables movement, eats cell charge, largely
...
impacts health, also makes ion rifles work correctly against pods
2015-03-15 17:59:22 +01: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
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
ZomgPonies
66dd040130
Gives the ability to stop someone climbing a table
2015-03-09 22:55:30 -04:00
ZomgPonies
b51850dfdd
Blueshield access change
2015-03-09 19:01:42 -04: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
