Commit Graph
15293 Commits
Author SHA1 Message Date
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
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 23da335c32 Malf AI old turret z level check 2015-03-01 04:33:33 +01:00
Markolie de255425d6 Malf turret upgrade fix 2015-03-01 04:26:02 +01: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 9816cf37cc Fix incorrect var name 2015-03-01 02:16:45 +01:00
Markolie b28f791f8f (Porta) turret update, map area update 2015-03-01 02:10:32 +01:00
Markolie bbcc9e63ce Disable inactivity kick 2015-03-01 00:30:55 +01:00
Markolie 6ecfb9adf2 Turret exploit fix 2015-02-28 23:55:28 +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 84a1947c2f Give Blueshield a bowman headset 2015-02-28 20:09:27 +01:00
Markolie 20a0ac7e35 Adjust nuke ops skin tone again 2015-02-28 19:56:30 +01: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 3be7fb33e3 Remove duplicate antag obj 2015-02-28 18:15:22 +01:00
Markolie 8ee485d46e Fix Vox heist objectives 2015-02-28 18:10:42 +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
ZomgPonies fced9d289f Updating defines to fit Paradise screen size 2015-02-28 11:30:43 -05:00
Markolie 7531d25ab6 Item path fix 2015-02-28 17:18:13 +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 a6237d8080 Merge pull request #458 from tigercat2000/spacepodfixes
Space-Pod 2-Seat fixes
2015-02-28 09:07:56 -05:00
ZomgPonies 11e782d1f7 Merge pull request #455 from Fox-McCloud/airflow-fix
Fixes Airflow Stunning
2015-02-28 09:07:39 -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 6b8b63d4b8 Fixes Airflow Stunning 2015-02-27 20:40:54 -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