cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-06 05:53:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,775 Commits 15 Branches 2 Tags
4cc30536605ba8dcafe31e6a9be9d0e40e6091c8
Commit Graph

328 Commits

Author SHA1 Message Date
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-04-24 02:55:32 +02:00
AffectedArc07 fa6ba7343f Merge branch 'master' into ss-alarms 2019-04-23 20:37:42 +01:00
AffectedArc07 42624fe847 Spaces > Tabs 2019-04-23 20:31:26 +01:00
Fox McCloud 5bd258c560 Merge pull request #11360 from AffectedArc07/ss-events 
SSevents & SSholiday
 2019-04-23 14:25:56 -04:00
variableundefined 905fc7607a Merge pull request #11328 from farie82/mhelp-rights-fix 
Admins can now see the mhelp tickets
 2019-04-23 20:46:34 +08:00
AffectedArc07 acee1dcb42 SSalarms 2019-04-23 12:45:35 +01:00
AffectedArc07 563a951975 SSevents & SSholiday 2019-04-23 10:55:36 +01:00
Couls 7eb7d723f9 Implement keybinding system and remove old hotkey modes 2019-04-23 01:31:03 -04:00
Kyep 4561ee94f8 WIP ports XKeyScore from TG 2019-04-22 16:53:20 -07:00
Mark van Alphen affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +02:00
Fox McCloud 4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
Mark van Alphen 7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
AffectedArc07 ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
AffectedArc07 a0581c314a SSvote 2019-04-21 16:34:11 +01:00
AffectedArc07 c16762c257 Kills air killing 2019-04-19 16:23:35 +01:00
joep van der velden 89b0ffae6a Admins can now see the mhelp tickets 2019-04-19 14:31:46 +02:00
Mark van Alphen 6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
AffectedArc07 52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
variableundefined b6c1026d74 Merge pull request #11297 from Fox-McCloud/update-gas-overlay 
Updates and Fixes Gas Overlays and Icy Floor Change
 2019-04-16 19:45:51 +08:00
Mark van Alphen e7e6752c54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/master_controller.dm
#	paradise.dme
 2019-04-14 19:17:06 +02:00
AffectedArc07 15e549fd7e Supers seem super useful 2019-04-14 16:57:15 +01:00
AffectedArc07 57fb39016c Stick it on my tab, barkeep 2019-04-14 16:57:15 +01:00
AffectedArc07 ae28500156 Init order changes 2019-04-14 16:56:06 +01:00
AffectedArc07 2304cf0f6f SSMapping 2019-04-14 16:56:06 +01:00
Fox McCloud 6334114f8c Updates and Fixes Gas Overlays 2019-04-13 01:44:05 -04:00
joep van der velden a010f2e7e2 whoops 2019-04-12 23:46:35 +02:00
Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
farie82 9034f2a214 Merge branch 'master' into mhelp-ticket-system 2019-04-07 14:43:49 +02:00
Mark van Alphen 99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
Fox McCloud 2b299dca42 Timer Subsystem Update 2019-03-31 00:19:35 -04:00
joep van der velden 3804de1f3b STAFF!!! 2019-03-10 09:05:06 +01:00
joep van der velden f9d01f396c Updated the closing permissions and added a new message for the closing of mhelps 2019-03-09 23:20:16 +01:00
joep van der velden 842615cd5b Fixed an ahelp follow up bug. Works now 2019-03-09 22:20:19 +01:00
joep van der velden 8d6cee7915 in between 2019-03-09 20:57:59 +01:00
datlo 91ef2d7be2 it's alive 2019-02-06 20:01:30 +00:00
joep van der velden 5ed5efd336 Added the safe message proc 2018-12-28 16:25:51 +01:00
variableundefined d7b2648020 Merge pull request #10185 from Mitchs98/moveresist 
Ports Move Force from TG
 2018-12-28 20:53:07 +08:00
tigercat2000 9fb54c4c82 Asset Cache speed (tgstation/tgstation#35003 + more) 2018-11-15 12:18:00 -08:00
Mitchell 7cd25c4d87 for ansari to view 2018-11-11 15:59:48 -06:00
Fox McCloud ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
tigercat2000 7a289c10b3 Merge pull request #9485 from variableundefined/ComponentFixesPort 
Port over TG component improvements.
 2018-10-22 10:50:33 -07:00
variableundefined cd677b6ef3 Merge pull request #9870 from SamHPurp/arrays-start-at-1-yo 
Fixes a cause of lag in the timer subsystem
 2018-10-22 07:07:25 +08:00
variableundefined e42adaa276 Fix 2018-10-21 21:59:43 +08:00
variableundefined 0dc7b39740 Remove 511 compatibility things 2018-10-21 21:54:50 +08:00
variableundefined 112f79b8b7 Merge pull request #9916 from SamHPurp/unused-atom-code 
Removing unused atom code
 2018-10-21 12:15:56 +08:00
variableundefined d4376fff69 Fixes conflict and screen object breaking 2018-10-21 08:31:46 +08:00
variableundefined 45fdcb4c46 Merge pull request #9719 from SamHPurp/smoothing-improvements 
Icon Smoothing to StonedMC
 2018-10-21 07:41:47 +08:00
Purpose a3b7b3c8c0 this does nothing 2018-10-20 21:59:00 +01:00
Fox McCloud 7d3be0e838 Updates the Garbage SS 2018-10-20 00:49:55 -04:00