cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 09:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,696 Commits 17 Branches 2 Tags
7007f6bbdf7ebdb09a5cd96aa1349e5bf446c519
Commit Graph
2416 Commits
Author SHA1 Message Date
Fox-McCloud 7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud 104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Fox-McCloud 706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Crazy LemonandGitHub 37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak 1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Chakirski b41009c685 matter_is_neither_created_nor_destroyed 2017-01-16 00:54:56 -06:00
Crazylemon64 224f86bd64 Bibles can reveal runes now 2017-01-13 13:42:56 -08:00
Fox McCloudandGitHub 68dfbf6217 Merge pull request #6131 from Crazylemon64/robot_module_actions 
Robot module actions
 2017-01-11 08:50:50 -05:00
Crazylemon64 a852d3f314 Fixes a garrote runtime 2017-01-10 18:28:40 -08:00
Crazy LemonandGitHub f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
Crazylemon64 36b967c93b Fully rips out cyborg sight modules 2017-01-10 00:32:11 -08:00
Crazylemon64 ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Crazylemon64 f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Aurorablade 98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 
# Conflicts:
#	code/game/machinery/doors/airlock.dm
 2016-12-29 11:01:43 -05:00
Fox McCloudandGitHub 5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective 
Polishes up `reset_view`
 2016-12-23 07:27:36 -05:00
Crazylemon64 c0cd2c263f Switches reset_view to reset_perspective 2016-12-21 17:59:08 -08:00
Crazylemon64 6d3e66f41c Polishes up the reset_view proc, which is basically 
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
 2016-12-21 17:56:57 -08:00
Fox McCloudandGitHub 398c3dce34 Merge pull request #5986 from tigercat2000/nano_patch_25 
NanoUI Update: Seperate UI Data into ui_data() proc
 2016-12-21 13:22:10 -05:00
TullyBurnalot 51a47b37b0 - 180 Reverse, Mines now banned from surplus 2016-12-20 10:09:38 +00:00
TullyBurnalot e9f4209188 Proximity Mines now work for everyone 
- Buttons are buttons
 2016-12-19 01:09:34 +00:00
Tigercat2000 b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc 
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
 2016-12-14 13:37:34 -08:00
Fox-McCloud 7a55ec18fc Merge remote-tracking branch 'upstream/master' into food-rework 2016-12-05 12:40:32 -05:00
Aurorablade fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -05:00
Fox-McCloud a1b8205fdd food 2016-11-29 08:45:46 -05:00
Crazylemon64 e212308cac The RCD making doors no longer has a shallow copy 
This means that changing accesses on the RCD will no longer
change accesses made on prior doors
 2016-11-28 02:25:05 -08:00
Crazy LemonandGitHub b769147449 Merge pull request #5897 from FlattestGuitar/e20 
e20 gets logged now
 2016-11-23 13:22:16 -08:00
Aurorablade 0c637cebfa Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-11-22 01:48:56 -05:00
Mieszko Jędrzejczak 7874bba921 e20 get logged 2016-11-20 01:42:22 +01:00
KasparoVy 0b23981f1b Fix. 
The spawnable DNA Injectors containing powers (XRay, etc.) will now
activate/deactivate the powers correctly.
 2016-11-19 18:29:43 -05:00
Aurorablade 5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Crazylemon64 6ec712df8c Fixes defib leaving people in deadchat, n2o paralyse time 2016-11-06 21:36:24 -08:00
Aurorablade 23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloudandGitHub 911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul 
Ports over the status effect unification from the extreme refactor
 2016-10-30 22:40:24 -04:00
Markolie a77b501ebf Runtime fix 2016-10-27 15:03:07 +02:00
Markolie 4dcb46d295 More minor briefcase changes 2016-10-27 15:00:31 +02:00
Markolie e9dc5b1b1f Fix secure briefcases appearing empty 2016-10-27 14:56:58 +02:00
Aurorablade 0a265f963c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-24 22:30:16 -04:00
Fox McCloudandGitHub 5fb35e7b23 Merge pull request #5809 from Markolie/idchecks 
Fix up a number of ID checks
 2016-10-24 15:52:01 -04:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie 79be3ca8cf Fix up a number of ID checks 2016-10-23 15:49:02 +02:00
TheDZDandGitHub 062a14f2af Merge pull request #5795 from Fox-McCloud/null-rod-cleanup 
Nullrod istype Helpers
 2016-10-22 09:35:16 -04:00
Markolie 1a307cd8c9 Identity theft objective set fix, tank examine fix, proccall null return fix 2016-10-21 17:51:38 +02:00
Markolie 7173a8fe9f Fix aliens double attacking, tank examining and ATM security level 0 interaction 2016-10-21 17:21:23 +02:00
Markolie 87920451e8 Fix robot lockdown through console and jetpack examine 2016-10-21 17:02:16 +02:00
Fox-McCloud 1da17e6863 Nullrod istype Helpers 2016-10-19 03:09:17 -04:00
Bone White b40f37444c Fix for issue #5768 
Correctly un-wields defib paddles when dropping.
 2016-10-16 15:36:01 +01:00
Aurorablade e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
KasparoVy ffc0083098 bottlefix 2016-09-18 01:06:47 -04:00