cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,190 Commits 28 Branches 2 Tags
b3e81dc09a646f2ee9221633c4cd68b0cf81c113
Commit Graph

3937 Commits

Author SHA1 Message Date
ZomgPonies
9a21ce5fef Merge pull request #529 from Fox-McCloud/Crayons 
Crayons and Gloves
 2015-03-08 13:24:05 -04:00
ZomgPonies
9e57d2424f Merge pull request #528 from TheDZD/nano_pai 
NanoUI pAIs
 2015-03-08 13:23:05 -04:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
DZD
d2d0627d43 NanoUI pAIs 2015-03-06 18:34:45 -05:00
ZomgPonies
8c34221110 Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix 
Fixes
 2015-03-06 12:55:24 -05:00
Fox-McCloud
7e542873fe Fixes 2015-03-06 01:13:03 -05:00
Fox-McCloud
a911b53e8b Life Proc Changes--Cold Space and and Temp Handling 2015-03-04 05:42:12 -05:00
Fox-McCloud
5cad8fe41e Merge pull request #500 from ZomgPonies/blood 
Proper colored blood
 2015-03-04 00:24:53 -05:00
ZomgPonies
3fec57ed8f Merge pull request #494 from Fox-McCloud/Cyborg-Balance 
Cyborg Rebalance
 2015-03-04 00:15:15 -05:00
ZomgPonies
463204c913 Merge pull request #493 from Markolie/master 
NanoUI synth airlock control, ERT equipment rework, fixes
 2015-03-03 21:28:22 -05:00
Markolie
3497d4ba9e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2015-03-03 22:58:41 +01:00
Markolie
4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
Fox-McCloud
253563e211 Energy Tweaks 2015-03-03 16:00:07 -05: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
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
Artorp
838b3960cc Fixes taperecorder emag_act() 2015-03-02 17:58:28 +01: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
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
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
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
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
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
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
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
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