Markolie
e30d4cc35d
Merge branch 'master' of https://github.com/Markolie/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-03-04 19:34:21 +01:00
Markolie
9cbb93777e
ERT armory rework
2015-03-04 19:06:22 +01:00
Markolie
4fb7a95cff
ERT equipment update
2015-03-04 17:16:19 +01:00
ZomgPonies
3fec57ed8f
Merge pull request #494 from Fox-McCloud/Cyborg-Balance
...
Cyborg Rebalance
2015-03-04 00:15:15 -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
3497d4ba9e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-03-03 22:58:41 +01:00
Markolie
4ac1007d82
ERT equipment rework
2015-03-03 22:51:54 +01:00
Fox-McCloud
253563e211
Energy Tweaks
2015-03-03 16:00:07 -05:00
Markolie
a4ab62de58
Fix debraining a severed head
2015-03-03 19:52:10 +01:00
SamCroswell
b8a9c902a1
Removes Space Ninjas
2015-03-02 19:05:44 -05:00
Artorp
838b3960cc
Fixes taperecorder emag_act()
2015-03-02 17:58:28 +01:00
ZomgPonies
6979cf6089
Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup
...
Chemistry Cleanup and Fixes
2015-03-01 23:08:16 -05:00
DZD
69eb5509ec
Fixes exchange document objective
2015-03-01 20:35:09 -05:00
Fox-McCloud
9235af2a3d
Tweaking
2015-03-01 17:34:03 -05:00
ZomgPonies
f262c04a79
Merge pull request #476 from Markolie/master
...
Re-add borer event, adjust vine event weight, fix magistrate headset
2015-03-01 15:15:12 -05:00
Markolie
3e01615ad7
Re-add borer event, adjust vine event weight, fix magistrate headset, mapfix
2015-03-01 21:04:11 +01: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
ZomgPonies
5a94b87331
Merge pull request #457 from Fox-McCloud/Cameras
...
Camera Update+Camera Bugs
2015-03-01 12:28:58 -05:00
Fox-McCloud
a7f631f364
Health and Stack Fixes
2015-03-01 01:07:14 -05:00
Markolie
6b70bfec74
NanoUI update
2015-03-01 04:22:12 +01:00
ZomgPonies
43783ca583
Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance
...
RnD Fixes and Tweaks
2015-02-28 22:16:37 -05:00
Fox-McCloud
a9285627ac
Merge remote-tracking branch 'upstream/master' into Cameras
2015-02-28 16:24:03 -05:00
Markolie
84a1947c2f
Give Blueshield a bowman headset
2015-02-28 20:09:27 +01: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
ZomgPonies
2a18787c50
Merge pull request #447 from Fox-McCloud/Shields
...
Telescopic Riot Shield
2015-02-28 09:07:07 -05:00
Fox-McCloud
62462c876f
Camera Update+Camera Bugs
2015-02-28 04:01:14 -05:00
Fox-McCloud
87c15c4e3f
Merge pull request #441 from SamCroswell/master
...
Quick-Equip Hotkey Fix, Pulse Rifle Icon Fix
2015-02-27 20:07:34 -05:00
Fox-McCloud
923ba5932f
RnD Fixes and Tweaks
2015-02-27 17:36:20 -05:00
SamCroswell
75b2220e3e
Merge Conflic Fix
...
Conflicts:
icons/obj/gun.dmi
2015-02-27 15:52:26 -05:00
ZomgPonies
f27ccb6f4d
Owlman/Griffin toys/posters/barsign
2015-02-27 13:24:45 -05:00
Mark van Alphen
d89c885a14
Merge pull request #435 from ZomgPonies/fixuns
...
Various fixings and additions
2015-02-27 18:22:35 +01:00
Fox-McCloud
30465b03d6
Telescopic Riot Shield
2015-02-27 07:31:03 -05:00
Fox-McCloud
c4950227ca
Fixes Watertanks
2015-02-27 01:56:15 -05:00
SamCroswell
5eec718c71
RCD fix
...
RCDs now take ammo properly.
2015-02-26 22:08:12 -05:00
ZomgPonies
90c5083ddf
Fix for rod inhands.
2015-02-26 17:05:23 -05:00
ZomgPonies
10bef3e8dd
Rods now change sprite depending on how much in the stack
2015-02-26 09:21:13 -05:00
Markolie
d118e026fa
Re-apply kitchen code
2015-02-25 22:14:14 +01:00
Markolie
8e159c51b3
Ensure extinguisher precision works
2015-02-25 21:33:34 +01: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
Markolie
6efa3bcdaa
Fix trays (now bags)
2015-02-25 20:42:43 +01:00
Markolie
89650e8590
Extinguisher wheelchair update, deathsquad robot fix
2015-02-25 19:56:24 +01:00
Markolie
e1f0d0fec7
Bug fixes, add atmos watertank
2015-02-25 19:47:04 +01:00
SamCroswell
8807f13305
ERT - Helmets Change, Cells Capacity Adjustment
...
The pulse pistol now has 1600 max charge, the Carbine now has a max
charge of 4000.
ERT helmets no longer need to be fastened to their suits to be equipped,
as this was causing bugs.
2015-02-24 14:25:28 -05:00
SamCroswell
c1c6c80eda
ERT - Emergency Box, Toolbelt Fix, PDA
...
The ERT's emergency box now contains:
- A survival knife
- A breath mask
- A full double-extended emergency oxygen tank
- A pair of night vision goggles.
- An inaprov autoinjector.
ERT engineering toolbelts now contain multitools. Whoops.
Add ERT PDAs, at Mark's request.
2015-02-24 13:02:15 -05:00
SamCroswell
cd7b1a4075
ERT Rework - Part One
2015-02-24 09:47:44 -05:00
ZomgPonies
859c907962
Merge pull request #396 from Markolie/master
...
Bug fixes, bot process update
2015-02-24 08:01:25 -05:00
Markolie
140e767c01
Add dot to desc
2015-02-24 02:18:46 +01:00
Markolie
3f51486ba4
Bug fixes, bot proces controller update
2015-02-24 01:40:43 +01:00
