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
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
38adfe06a0
Removes Recursive Explosions
2015-03-19 03:23:14 -04:00
DZD
f81848033f
Comments out plasma mineral doors burning
2015-03-18 22:15:41 -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
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
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
ZomgPonies
66dd040130
Gives the ability to stop someone climbing a table
2015-03-09 22:55:30 -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
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
SamCroswell
9b87487783
Minor Fixes
2015-03-07 23:13:00 -05:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
ZomgPonies
463204c913
Merge pull request #493 from Markolie/master
...
NanoUI synth airlock control, ERT equipment rework, fixes
2015-03-03 21:28:22 -05:00
Markolie
4ac1007d82
ERT equipment rework
2015-03-03 22:51:54 +01:00
SamCroswell
b8a9c902a1
Removes Space Ninjas
2015-03-02 19:05:44 -05:00
ZomgPonies
6979cf6089
Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup
...
Chemistry Cleanup and Fixes
2015-03-01 23:08:16 -05:00
Fox-McCloud
3bed31e08c
Chemistry Cleanup and Fixes
2015-03-01 16:34:23 -05:00
ZomgPonies
2b917b17cd
Merge pull request #475 from Markolie/master
...
Bug fixes galore
2015-03-01 14:41:42 -05:00
Markolie
d7a2559065
Bug fixes galore
2015-03-01 20:35:07 +01:00
ZomgPonies
7799470ca5
Merge pull request #460 from Markolie/master
...
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
2015-03-01 12:30:15 -05:00
Mark van Alphen
18692eedfe
Merge pull request #450 from ZomgPonies/fixuns
...
More fixins and various features
2015-02-28 17:33:28 +01:00
Markolie
e4328a7f5e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
2015-02-28 17:13:53 +01:00
Markolie
f7426c8d72
Add bandanas, mask toggling, camo armor jacket and bugfixes
2015-02-28 17:09:45 +01:00
ZomgPonies
89ce02b426
Merge pull request #451 from Markolie/master
...
Temperature fixes
2015-02-28 09:48:01 -05:00
Markolie
a735e6855c
Reduce malf ticker time, update fire damage, fix breathing
2015-02-28 15:44:43 +01:00
ZomgPonies
2a18787c50
Merge pull request #447 from Fox-McCloud/Shields
...
Telescopic Riot Shield
2015-02-28 09:07:07 -05:00
ZomgPonies
f27ccb6f4d
Owlman/Griffin toys/posters/barsign
2015-02-27 13:24:45 -05:00
Markolie
20ac07de8d
Bug fixes
2015-02-27 17:51:57 +01:00
Fox-McCloud
30465b03d6
Telescopic Riot Shield
2015-02-27 07:31:03 -05:00
ZomgPonies
d14c4e4f58
Merge pull request #431 from Fox-McCloud/Lasers-Tasers
...
Laser Additions and Taser Nerf
2015-02-26 22:49:46 -05:00
ZomgPonies
2f9b435a0f
Merge pull request #426 from Markolie/master
...
Bug fixes, add atmos watertank
2015-02-26 13:50:37 -05:00
Fox-McCloud
9850e6deb2
Laser Additions and Taser Nerf
2015-02-25 23:34:42 -05:00
Markolie
bfe8a12f1e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/objects/items/weapons/kitchen.dm
2015-02-25 20:44:32 +01:00
ZomgPonies
887e4b93f7
Ported outside crate manifest
2015-02-25 14:02:14 -05:00
Markolie
e1f0d0fec7
Bug fixes, add atmos watertank
2015-02-25 19:47:04 +01:00
ZomgPonies
5c14d9c5f2
vg Garbage Collector
2015-02-23 17:18:38 -05:00
Markolie
8f5bddbb32
Fix compile error
2015-02-22 22:29:58 +01:00
Markolie
672305e034
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
2015-02-22 22:12:11 +01:00
Markolie
377dfe894d
Add attack animations
2015-02-22 21:15:54 +01:00
Markolie
72db213067
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/jobs/job/support.dm
code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
Markolie
3b072b5a62
Remove click delay from most things
2015-02-22 18:47:58 +01:00
ZomgPonies
1f5ef8d4dd
Merge pull request #380 from Markolie/master
...
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
