Commit Graph

17074 Commits

Author SHA1 Message Date
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
Markolie
7c2224b880 Temperature fixes 2015-02-27 21:11:36 +01:00
ZomgPonies
f27ccb6f4d Owlman/Griffin toys/posters/barsign 2015-02-27 13:24:45 -05: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
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
eb311e3e86 Escape shuttle loses ability to cancel launches. 2015-02-27 01:39:05 -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
Fox-McCloud
008dcbe0a9 Merge pull request #443 from ZomgPonies/master
Fix mentors seeing MSAY
2015-02-26 22:09:15 -05:00
SamCroswell
5eec718c71 RCD fix
RCDs now take ammo properly.
2015-02-26 22:08:12 -05:00
ZomgPonies
9d5e259eb8 Merge pull request #440 from Fox-McCloud/Gamebreaking-Bug
Fixes a Gamebreaking Bug
2015-02-26 22:00:36 -05:00
ZomgPonies
64bd0abd71 Fix mentors seeing MSAY 2015-02-26 21:41:59 -05:00
SamCroswell
fa882c7516 Quick-Equip Hotkey Fix
The quick equip hotkey now checks to see if the RIG helmet you're trying
to equip actually requires to be attached to the suit or not.
2015-02-26 21:26:23 -05:00
Fox-McCloud
9bae042444 Fixes a Gamebreaking Bug 2015-02-26 21:07:50 -05:00
ZomgPonies
4fdd31f0da 5 new Vox quill styles, thanks to FullofSkittles 2015-02-26 20:08:20 -05:00
ZomgPonies
7aa0f8f500 Move event manager panel to event tab 2015-02-26 19:18:28 -05:00
ZomgPonies
4c6337108a Remove news events 2015-02-26 18:59:01 -05:00
ZomgPonies
ff05a93a08 DERPEDYDERP 2015-02-26 18:04:57 -05:00
ZomgPonies
54f4dda1b7 Made plasmamen suits EVA 2015-02-26 17:42:17 -05:00