cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

167 Commits

Author SHA1 Message Date
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
Purpose
75fdf0095d more 2018-10-18 20:54:22 +01:00
Fox McCloud
ee8d6bade6 Fixes Timer SS Timeouts 2018-10-16 23:40:57 -04:00
Purpose
45c61f599a arrays start at 0 damnit 2018-10-15 22:45:52 +01:00
Purpose
d740ecbd35 Update icon_smooth.dm 2018-10-14 14:59:54 +01:00
Purpose
b2fc276158 Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements 2018-10-13 21:34:04 +01:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
021f55539f Merge pull request #9776 from tigercat2000/hover_indicator_inventory 
SSOverlays & Hover Inventory Indicator
 2018-10-10 22:19:26 +08:00
variableundefined
3350cdd27f Merge pull request #9789 from Birdtalon/runtime 
Fixes runtime in tickets.dm
 2018-10-10 17:02:25 +08:00
tigercat2000
39c6b5d1e7 Spacing 2018-10-09 20:37:46 -07:00
Birdtalon
4a640e9290 .len to length() 2018-10-09 19:35:12 +01:00
tigercat2000
8ce0592ac0 SSOverlays & Hover Inventory Indicator 
This ports the hover inventory indicator from /tg/, and by necessity, SSOverlays.
The hover inventory indicator basically shows where you are trying to
put an item, and then shows an item ghost in red or green, giving visual
feedback as to if that item will go in the slot or not.

SSOverlays is a much broader system for managing overlays, which should
eventually take over *all* overlays, but I have only ported the basic
system and implemented it where necessary for it to work for the hover
inventory items currently.
 2018-10-08 22:50:39 -07:00