Commit Graph

9304 Commits

Author SHA1 Message Date
Markolie b8786053a1 Clown/Mime door sounds 2015-03-03 20:11:24 +01:00
Markolie 0000d28dfd Door speedup 2015-03-03 20:04:04 +01:00
Markolie a4ab62de58 Fix debraining a severed head 2015-03-03 19:52:10 +01:00
ZomgPonies 8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
Markolie d727b93cc0 Further door fixes 2015-03-03 19:26:12 +01:00
Markolie 1db034a8f8 NanoUI synth airlock update 2015-03-03 18:45:22 +01:00
Tigercat2000 4ee50db53e Adds an 'animation' for feeding people into the gibber. 2015-03-03 15:28:13 +01:00
Fox-McCloud c1a1f851cf Cyborg Rebalance 2015-03-02 22:54:09 -05:00
Markolie 1deef3104e NanoUI synth airlock controller 2015-03-03 04:51:32 +01:00
ZomgPonies 0334dd0757 Merge pull request #489 from Markolie/master
Bug fixes
2015-03-02 21:19:01 -05:00
SamCroswell b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
Artorp 653bb883ff Gives cargo computers a contents link
Allows people to preview what they are requesting via the Supply Shuttle
Console and the Supply Ordering Console
2015-03-02 22:37:12 +01:00
Markolie 82b96d305f Bug fixes, update quick create object 2015-03-02 21:20:12 +01:00
Markolie 2d152cb82d Debug 2015-03-02 18:49:12 +01:00
Markolie 3d9807f78c Floor bot improvements 2015-03-02 18:46:50 +01:00
Markolie cf0220312b Bug fixes 2015-03-02 18:30:40 +01:00
Artorp 838b3960cc Fixes taperecorder emag_act() 2015-03-02 17:58:28 +01:00
Markolie 0fe7d84551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-02 17:33:00 +01: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
Markolie 2a0e9af539 Minor fixes 2015-03-02 02:07:53 +01:00
ZomgPonies 86e300bc67 Fixes Ghostsight for realsies 2015-03-01 19:10:25 -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
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 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 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
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 5e4539157c Add minimum age for drones/ERT 2015-02-28 19:40:56 +01:00
Markolie 8ee485d46e Fix Vox heist objectives 2015-02-28 18:10:42 +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 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