Commit Graph

8878 Commits

Author SHA1 Message Date
Fox-McCloud
253563e211 Energy Tweaks 2015-03-03 16:00:07 -05:00
Fox-McCloud
c1a1f851cf Cyborg Rebalance 2015-03-02 22:54:09 -05:00
Mark van Alphen
3e5bc9e230 Merge pull request #487 from Artorp/FewFixes
Few bugfixes
2015-03-02 18:21:15 +01:00
Artorp
7843fed4ce Updates paperwork: Armory list 2015-03-02 17:59:22 +01:00
ZomgPonies
efcbfebf99 Emergency corgi runtime Fix 2015-03-02 11:22:21 -05:00
Fox-McCloud
63352fcfc2 Merge pull request #479 from ZomgPonies/darkness
The Ghostsight the server deserves
2015-03-02 00:57:12 -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
DZD
69eb5509ec Fixes exchange document objective 2015-03-01 20:35:09 -05:00
ZomgPonies
bc7088a6d7 Added AIeye to new system 2015-03-01 19:40:02 -05:00
ZomgPonies
86e300bc67 Fixes Ghostsight for realsies 2015-03-01 19:10:25 -05:00
Fox-McCloud
dcd22fe5d7 Cooooloonnnsss 2015-03-01 17:42:49 -05:00
Fox-McCloud
9235af2a3d Tweaking 2015-03-01 17:34:03 -05:00
Fox-McCloud
3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -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
Mark van Alphen
5b4c156989 Merge pull request #459 from ZomgPonies/corgi
Ports CorgiUI
2015-03-01 18:30:21 +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
Mark van Alphen
062f5494b2 Merge pull request #469 from Fox-McCloud/Various-Fixes
Health and Stack Fixes
2015-03-01 18:22:13 +01:00
FalseIncarnate
85366b8307 Xenoarchaeology Find icon fix
Fixes the icons for the energy guns found through Xenoarchaeology to
actually use icons that exist.
2015-03-01 01:30:21 -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
Markolie
607ebed0f0 Further turret fixes 2015-03-01 02:53:01 +01:00
Markolie
b28f791f8f (Porta) turret update, map area update 2015-03-01 02:10:32 +01:00
Markolie
0b5494194e Cargo controller fix 2015-02-28 23:32:27 +01:00
Markolie
be47c7007a Fixes alien spacewalking 2015-02-28 23:12:18 +01:00
Artorp
dbca446d6d Allow paperbins to be picked up from backpacks
Prevents it from being stuck in inventories
2015-02-28 23:09:29 +01:00
Fox-McCloud
a9285627ac Merge remote-tracking branch 'upstream/master' into Cameras 2015-02-28 16:24:03 -05:00
Markolie
8a41ab2025 Taking off mask disables internals 2015-02-28 19:51:14 +01:00
Markolie
5e4539157c Add minimum age for drones/ERT 2015-02-28 19:40:56 +01:00
Markolie
99dd8bf811 Fix handcuff mob sprite not updating 2015-02-28 17:54:37 +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
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
ba2b5589e9 Ported CorgiUI 2015-02-28 10:59:14 -05: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
Fox-McCloud
62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Fox-McCloud
0aa45feffb Merge pull request #439 from TheDZD/minor-fixes
Swaps Xeno Sentinel and Hunter Health Values
2015-02-27 20:07:56 -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
Markolie
42935580da Adjust cold temperature message 2015-02-27 21:32:31 +01:00
Markolie
7c2224b880 Temperature fixes 2015-02-27 21:11:36 +01:00
ZomgPonies
b1395e0b35 Disabling drone sprite picking as per community vote 2015-02-27 12:56:43 -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