cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-20 19:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d98eb14a3950683f6ddb0fed9674396faf900d8a
Paradise/code/modules
History
Mark van Alphen d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-04 03:16:38 +02:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
alarm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
antagonists
Merge pull request #11259 from Markolie/flukeops
2019-04-18 07:16:31 +08:00
arcade
Adds 4 new plushies
2019-05-01 21:43:32 +02:00
assembly
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
atmos_automation
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
awaymissions
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
buildmode
…
busy_space
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
client
Merge pull request #11299 from Kyep/ssd_auto_cryo_option
2019-04-30 11:29:49 +08:00
clothing
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
countdown
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
crafting
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-30 19:26:17 +02:00
customitems
Merge pull request #11129 from iantine/master
2019-04-28 20:52:39 -04:00
detective_work
…
discord
…
economy
…
error_handler
…
events
processing fix
2019-04-27 22:33:10 -04:00
examine
…
ext_scripts
…
fancytitle
…
fish
…
flufftext
Chameleon overhaul
2019-05-01 20:59:41 +02:00
food_and_drinks
…
games
…
holiday
SSevents & SSholiday
2019-04-23 10:55:36 +01:00
hydroponics
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-30 19:26:17 +02:00
karma
…
library
…
lighting
…
logic
SScommunications
2019-04-21 20:12:14 +01:00
map_fluff
…
martial_arts
…
mining
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
modular_computers
Merge pull request #11365 from Kyep/id_card_tracking
2019-04-30 13:28:03 +08:00
nano
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
ninja
Chameleon overhaul
2019-05-01 20:59:41 +02:00
paperwork
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
pda
Here we go again
2019-05-03 21:47:07 +08:00
persistence
…
power
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-30 19:26:17 +02:00
procedural_mapping
…
projectiles
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-26 23:07:57 +02:00
reagents
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-03 18:31:45 +02:00
recycling
…
research
Merge pull request #11376 from Arkatos1/Cardboard
2019-04-29 23:08:16 +08:00
response_team
Fixes/refactors unspawnable ERT alert
2019-04-22 07:03:55 -07:00
ruins
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-26 23:07:57 +02:00
security_levels
…
shuttle
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-04 03:16:38 +02:00
space_management
…
spacepods
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
station_goals
SSevents & SSholiday
2019-04-23 10:55:36 +01:00
store
…
surgery
Initialize fix
2019-05-01 02:35:26 +02:00
telesci
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
tooltip
…
tram
…
vehicle
…
vr
…