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
a6237d8080
Merge pull request #458 from tigercat2000/spacepodfixes
...
Space-Pod 2-Seat fixes
2015-02-28 09:07:56 -05:00
ZomgPonies
2a18787c50
Merge pull request #447 from Fox-McCloud/Shields
...
Telescopic Riot Shield
2015-02-28 09:07:07 -05:00
Tigercat2000
8551e5b31e
Tiny extra fix to display a fail message if glitching is attempted
2015-02-28 14:21:17 +01:00
Tigercat2000
73a5a385d6
Two-seater spacepod fixes
...
This patch should make pods actually /two/ seaters, and not an infinite
corpse transporter.
2015-02-28 14:08:20 +01:00
Fox-McCloud
1dba775cd8
Consistency
2015-02-28 04:19:38 -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
Markolie
0ce4e6b40a
Blob sound fix
2015-02-27 18:04:13 +01: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
FalseIncarnate
de4fe78f13
Removes HEADER option from Supply Ordering Consoles
...
Removes the HEADER option, thus removing the supply point exploit tied
to it.
2015-02-27 05:17:22 -05:00
Fox-McCloud
c4950227ca
Fixes Watertanks
2015-02-27 01:56:15 -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
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
2f9b435a0f
Merge pull request #426 from Markolie/master
...
Bug fixes, add atmos watertank
2015-02-26 13:50:37 -05:00
Mark van Alphen
32919be0a7
Merge pull request #428 from Artorp/AutolatheQueue
...
Autolathe queue shows items being processed
2015-02-26 19:20:29 +01:00
Mark van Alphen
30fca58c4f
Merge pull request #427 from ZomgPonies/cargo
...
Crates are mailed with manifests taped to the outside
2015-02-26 19:20:24 +01:00
ZomgPonies
9dc5f6750c
Firedoors no longer block zones
2015-02-26 12:43:39 -05:00
ZomgPonies
10bef3e8dd
Rods now change sprite depending on how much in the stack
2015-02-26 09:21:13 -05:00
Fox-McCloud
9850e6deb2
Laser Additions and Taser Nerf
2015-02-25 23:34:42 -05:00
ZomgPonies
5421754760
Merge pull request #418 from Fox-McCloud/Fixes-Genetics
...
Fixes, Genetics, and Balance
2015-02-25 21:56:33 -05:00
Mark van Alphen
eea58c6951
Merge pull request #415 from ZomgPonies/superhero
...
Superhero Part 2: Owlman vs. The Griffin!
2015-02-26 00:59:37 +01:00
Artorp
8f1081a86f
Autolathe queue fix
...
Old oversight, stacks and cost calculation was bugged
2015-02-26 00:41:58 +01:00
Artorp
90e346fef3
Autolathe queue support for stacks
...
- Processing line (first item in list) will now show stack multiplier
where applicable
- Resources are taken before item is being created, to properly update
the UI
2015-02-26 00:02:13 +01:00
Artorp
99d5a4970b
Autolathe queue shows items being processed
2015-02-25 22:23:40 +01: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
ZomgPonies
887e4b93f7
Ported outside crate manifest
2015-02-25 14:02:14 -05: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
Mark van Alphen
f15f8fb5ae
Merge pull request #422 from ZomgPonies/master
...
GC fixes
2015-02-25 17:49:17 +01:00
ZomgPonies
3e4b4d2b6a
Merge pull request #406 from SamCroswell/master
...
ERT Rework
2015-02-25 11:43:07 -05:00
ZomgPonies
710d60abda
GC fixes
2015-02-25 10:58:56 -05:00
Fox-McCloud
85d79677b1
Fixes, Genetics, and Balance
2015-02-24 22:58:05 -05:00
ZomgPonies
8714512403
Superhero Part 2: Owlman vs. The Griffin!
2015-02-24 20:13:00 -05:00
ZomgPonies
9ca2500cf3
Merge pull request #414 from Markolie/master
...
Mapfix, hivemind fix
2015-02-24 19:48:36 -05:00
Markolie
da05274bf4
Mapfix, hivemind fix
2015-02-25 01:13:53 +01:00
SamCroswell
f004028d2b
ERT - Medic Hypospray Fix
...
The medic's default hypospray was empty. Whoops.
Should be filled with DD now.
2015-02-24 14:36:04 -05: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
c2c7505aa0
ERT - PDA colors
2015-02-24 13:47:26 -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
