Commit Graph
639 Commits
Author SHA1 Message Date
Kyep 97e53916f6 job transfers now correctly update job slots 2019-04-29 20:10:06 -07:00
Citinited 9976ad9ea1 Adds airlock spawners 2019-04-27 21:41:36 +01:00
Fox McCloud d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Mark van Alphen 40c1a25eb5 Lighting fixes 2019-04-27 01:08:17 +02:00
Mark van Alphen 4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +02:00
Mark van Alphen e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-04-26 22:58:56 +02:00
Couls 5903ad2dfd Implement AZERTY and numpad targetting options 2019-04-26 03:33:29 -04:00
Couls a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04:00
Kyep 6d0d7ae506 fix centcom computers, add crew transfer log feature 2019-04-24 15:43:08 -07:00
Fox McCloud 5bdbb64da2 returning parent value 2019-04-24 01:11:42 -04:00
Kyep 3ef424eb5c upgrades ID computer 2019-04-23 21:02:27 -07:00
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
AffectedArc07andGitHub 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 McCloudandGitHub 5bd258c560 Merge pull request #11360 from AffectedArc07/ss-events
SSevents & SSholiday
2019-04-23 14:25:56 -04:00
variableundefinedandGitHub 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 McCloudandGitHub 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
variableundefinedandGitHub 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
farie82andGitHub 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
variableundefinedandGitHub 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