cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
2c5e216e82795ce6d8a0b33e856ccc4f1f36ff85
Paradise/code/modules
History
Mark van Alphen 2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
2019-05-17 17:37:18 +02:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-17 17:37:18 +02:00
alarm
…
antagonists
Merge branch 'master' into ss-ticker
2019-05-13 18:14:00 +01:00
arcade
Adds 4 new plushies
2019-05-01 21:43:32 +02:00
assembly
…
atmos_automation
…
awaymissions
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-13 22:14:38 +02:00
buildmode
…
busy_space
…
client
Merge pull request #11480 from Tayyyyyyy/messages_window
2019-05-17 19:20:22 +08:00
clothing
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-17 17:37:18 +02:00
countdown
…
crafting
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-30 19:26:17 +02:00
customitems
Switch to material glasses
2019-05-06 05:47:49 +02:00
detective_work
…
discord
…
economy
Removes unused hooks
2019-05-05 10:28:56 +01:00
error_handler
…
events
Merge
2019-05-09 17:06:35 +01:00
examine
…
ext_scripts
…
fancytitle
…
fish
…
flufftext
Chameleon overhaul
2019-05-01 20:59:41 +02:00
food_and_drinks
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-17 17:37:18 +02:00
games
…
holiday
…
hydroponics
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-30 19:26:17 +02:00
karma
SSticker
2019-04-30 16:47:47 +01:00
library
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-13 22:14:38 +02:00
lighting
Fix dynamic lighting on shuttles
2019-05-04 05:51:13 +02:00
logic
…
map_fluff
…
martial_arts
…
mining
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-17 17:37:18 +02:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-17 17:37:18 +02:00
modular_computers
Removes unused hooks
2019-05-05 10:28:56 +01:00
nano
…
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-08 21:40:35 +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-05-13 22:14:38 +02:00
procedural_mapping
…
projectiles
…
reagents
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-13 22:14:38 +02:00
recycling
Merge pull request #11476 from Arkatos1/inhand
2019-05-17 19:17:32 +08:00
research
…
response_team
Merge pull request #11486 from Tayyyyyyy/better_ert_spawn
2019-05-17 23:07:30 +08:00
ruins
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-05-08 21:40:35 +02:00
security_levels
SSticker
2019-04-30 16:47:47 +01:00
shuttle
Shuttle and map fixes
2019-05-08 22:05:11 +02:00
space_management
…
spacepods
…
station_goals
SSticker
2019-04-30 16:47:47 +01:00
store
…
surgery
Merge
2019-05-09 17:06:35 +01:00
telesci
…
tooltip
…
tram
More lighting fixes
2019-05-04 03:06:10 +02:00
vehicle
…
vr
…