Mark van Alphen
98f06c5d4d
Merge pull request #627 from tigercat2000/ChaplainNERRFSS
...
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-23 15:38:40 +01:00
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
8da3cb1de5
Merge pull request #616 from tigercat2000/BorgIlocker
...
Allow borgs to open-close lockers properly
2015-03-22 18:00:35 -04:00
Tigercat2000
689713ddbd
Add clickdelay to attacking statues
2015-03-22 18:24:20 +01:00
Tigercat2000
9a19420ac3
Fix spelling error
2015-03-22 15:39:25 +01:00
Tigercat2000
c40c37390f
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-22 15:29:37 +01:00
Tigercat2000
b9adc59d26
Allow borgs to open-close lockers properly
2015-03-21 14:28:29 +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
Fox-McCloud
ba28d8e5b3
Incendiary Grenade
2015-03-20 17:02:22 -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
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
3fc1941a14
Merge pull request #588 from Fox-McCloud/Implants
...
Implant Cleanup
2015-03-19 01:41:18 -04: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
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
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
a31cdc9091
Merge pull request #572 from SamCroswell/NinjaDev
...
Ninja Restructure
2015-03-15 16:58:41 -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
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
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
ZomgPonies
4d1c80b7d9
Merge pull request #535 from FalseIncarnate/master
...
Kitchen Overhaul
2015-03-09 13:40:49 -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
FalseIncarnate
e4a5190188
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-08 20:29:07 -04:00
Fox-McCloud
89f2aea30d
Insulated Gloves Fix
2015-03-08 19:12:35 -04:00
SamCroswell
5bb63a7f63
Merge Conflict Resolution
...
Conflicts:
icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -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
b573472e55
Adds missing spacesuits to plasmamen
2015-03-08 14:34:39 -04:00
Markolie
80a560d291
Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4
2015-03-08 19:05:36 +01:00
Markolie
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
ZomgPonies
9a21ce5fef
Merge pull request #529 from Fox-McCloud/Crayons
...
Crayons and Gloves
2015-03-08 13:24:05 -04:00
