cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,155 Commits 26 Branches 2 Tags
e30d4cc35da5139ea2589e87007ecaf3520f3aae
Commit Graph

8902 Commits

Author SHA1 Message Date
Markolie
e30d4cc35d Merge branch 'master' of https://github.com/Markolie/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2015-03-04 19:34:21 +01:00
ZomgPonies
a44e80a415 Fix blood drip colors 2015-03-04 11:40:26 -05:00
Markolie
4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
Markolie
9c54d2feaa Central Command access rework 2015-03-04 16:36:17 +01:00
ZomgPonies
bc900d678a Merge pull request #512 from Markolie/master 
Fix player panel, other fixes
 2015-03-04 10:23:36 -05:00
Markolie
6352d2abd9 Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix 2015-03-04 15:09:12 +01:00
Markolie
691fef1ff0 Fix player panel 2015-03-04 14:47:45 +01: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
ZomgPonies
10ee512d22 Merge pull request #492 from SamCroswell/dave-NinjaDev 
Removes Space Ninjas
 2015-03-03 21:26:16 -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
ZomgPonies
90f950fdf5 Merge pull request #490 from Artorp/KitchenHarvest 
Makes harvesting animals give meat equal to their meat amount
 2015-03-03 14:07:28 -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
Markolie
3f7e07101f Mercenary --> Syndicate Operative 2015-03-03 18:48:58 +01:00
Markolie
4dd857e022 Ion storm event update 2015-03-03 18:43:55 +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
Markolie
82b96d305f Bug fixes, update quick create object 2015-03-02 21:20:12 +01:00
Artorp
95538029a1 Harvesting animals will always gib 2015-03-02 20:14:02 +01:00
Artorp
c35711c394 Makes harvest() give meat equal to meat_amount 2015-03-02 19:50:50 +01: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