cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-13 02:10:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,155 Commits 13 Branches 2 Tags
efd546d1e4635eeeee88e126f21c92fb6902a3bd
Commit Graph

1011 Commits

Author SHA1 Message Date
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
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 1db034a8f8 NanoUI synth airlock update 2015-03-03 18:45:22 +01:00
Markolie 1deef3104e NanoUI synth airlock controller 2015-03-03 04:51:32 +01:00
SamCroswell b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05: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
Fox-McCloud a9285627ac Merge remote-tracking branch 'upstream/master' into Cameras 2015-02-28 16:24:03 -05:00
Markolie 3be7fb33e3 Remove duplicate antag obj 2015-02-28 18:15:22 +01:00
Fox-McCloud 62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Markolie 20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
ZomgPonies 2f9b435a0f Merge pull request #426 from Markolie/master 
Bug fixes, add atmos watertank
 2015-02-26 13:50:37 -05:00
ZomgPonies 5421754760 Merge pull request #418 from Fox-McCloud/Fixes-Genetics 
Fixes, Genetics, and Balance
 2015-02-25 21:56:33 -05:00
Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
 2015-02-25 20:44:32 +01:00
Markolie 6efa3bcdaa Fix trays (now bags) 2015-02-25 20:42:43 +01:00
ZomgPonies 710d60abda GC fixes 2015-02-25 10:58:56 -05:00
Fox-McCloud 85d79677b1 Fixes, Genetics, and Balance 2015-02-24 22:58:05 -05:00
Markolie b44255d250 Bug fixes 2015-02-24 18:57:12 +01:00
Mark van Alphen 8457375738 Merge pull request #391 from ZomgPonies/schedule 
Goon process scheduler
 2015-02-23 19:46:17 +01:00
ZomgPonies e9288c614b Merge pull request #388 from Markolie/master 
Remove click delay, standardize mutations, attack animations, attackby() params addition
 2015-02-23 12:47:25 -05:00
Mark van Alphen 130ed7e18c Merge pull request #381 from Artorp/MimeDoor 
Gives the mime his very own door and ports /tg/ mime backpack
 2015-02-22 22:29:03 +01:00
ZomgPonies 2c50a42ba7 Goon process scheduler 2015-02-22 15:24:46 -05:00
Markolie 377dfe894d Add attack animations 2015-02-22 21:15:54 +01:00
Artorp 772e931706 Mime backpack: Mandatory & added to supply crates 2015-02-22 20:45:26 +01:00
Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
 2015-02-22 19:12:11 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
ZomgPonies 1f5ef8d4dd Merge pull request #380 from Markolie/master 
Adds celsius to the freezer/heater, crafting update
 2015-02-22 08:30:11 -05:00
ZomgPonies 1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits 
Syndi hardsuits
 2015-02-22 08:27:38 -05:00
Markolie efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
DZD 5e977cbfc9 Merge remote-tracking branch 'upstream/master' into changeling 2015-02-20 19:05:25 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Markolie c89e3ac1eb Revert "Revert "Emergency communications hotfix"" 
This reverts commit 3ea36839a8.
 2015-02-20 17:59:07 +01:00
Markolie d8d1670b68 Revert "Revert "Saycode/language/species port from Bay"" 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-02-20 17:46:35 +01:00
Fox-McCloud 99d92aea35 Buckshot 2015-02-20 04:46:53 -05:00
DZD 2e848c2c37 Merge remote-tracking branch 'upstream/master' into changeling 2015-02-19 20:59:41 -05:00
DZD 212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
DZD 4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
DZD fbd9c367c0 NODROP flag addition & handling 
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
 2015-02-18 13:22:41 -05:00
Markolie 21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Markolie f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/machinery/atmoalter/canister.dm
 2015-02-17 02:12:22 +01:00
Markolie 95e18fd397 Solar update, convert solar to NanoUI 2015-02-16 21:35:34 +01:00
Markolie 8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Markolie ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Fox-McCloud a21f5f5048 Fix 2015-02-14 22:04:19 -05:00
Fox-McCloud 1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud 0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00