cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-15 08:07:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
6c8fe1d506b3e7539c5d9f05a95a0e6d03e0087f
Paradise/code/modules
T
History
Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
..
admin
Merge pull request #11825 from Ty-Omaha/permaban
2019-07-15 19:18:49 -06:00
alarm
…
antagonists
…
arcade
…
assembly
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
atmos_automation
…
awaymissions
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
buildmode
…
busy_space
…
client
Merge pull request #11732 from farie82/AFK-subsystem
2019-07-20 21:28:52 +08:00
clothing
Merge pull request #11125 from Quantum-M/editVampireMuzzle
2019-07-09 18:15:42 +08:00
countdown
…
crafting
…
customitems
…
detective_work
…
economy
…
error_handler
…
events
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
examine
…
ext_scripts
…
fancytitle
…
fish
…
flufftext
Portal fixes - adds oldloc to Crossed()
2019-07-15 20:16:17 +02:00
food_and_drinks
Carton throwforce lowered
2019-07-12 18:07:23 +02:00
games
…
holiday
…
hydroponics
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
karma
…
keybindings
Merge pull request #11872 from Couls/AZERTY-cyborg-fix
2019-07-30 23:13:32 +08:00
library
…
lighting
…
logic
…
map_fluff
…
martial_arts
…
mining
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
modular_computers
…
nano
…
ninja
Merge pull request #11544 from Arkatos1/recharger
2019-07-08 20:18:36 +08:00
paperwork
Merge pull request #11562 from Tayyyyyyy/markdown
2019-07-08 20:20:46 +08:00
pda
…
persistence
…
power
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
procedural_mapping
…
projectiles
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
reagents
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
recycling
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
research
Merge pull request #11738 from evankhellparadise/portableseed
2019-06-29 09:23:22 +08:00
response_team
…
ruins
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00
security_levels
…
shuttle
…
space_management
…
spacepods
More testmerge fixes and improvements
2019-07-09 07:59:12 -04:00
station_goals
…
store
…
surgery
Merge pull request #11653 from Couls/bone-rework
2019-07-12 18:15:17 +08:00
telesci
Merge pull request #11634 from Markolie/laborstacker
2019-07-09 18:21:58 +08:00
tooltip
…
tram
…
vehicle
…
vr
…