cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 01:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
45a066c7d19597c6583a617ff781367bbc6ef821
Paradise/code/modules
History
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
..
admin
Resolve some issues that the compiler doesn't spot
2019-03-29 16:21:15 +01:00
alarm
…
antagonists
Redundant objective line removed, improved descriptions
2019-03-28 01:18:17 +01:00
arcade
…
assembly
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
atmos_automation
…
awaymissions
Add Beach biodome ruin and other fixes
2019-03-30 22:48:11 +01:00
buildmode
Resolve some issues that the compiler doesn't spot
2019-03-29 16:21:15 +01:00
busy_space
…
client
Merge pull request #11075 from AffectedArc07/alphabetisation-for-all
2019-03-24 17:51:50 +08:00
clothing
Suicide Refactor
2019-03-27 22:54:26 -04:00
countdown
…
crafting
…
customitems
Suicide Refactor
2019-03-27 22:54:26 -04:00
detective_work
…
discord
Moves discord verbs to "Special Verbs" instead of "OOC"
2019-03-04 15:49:10 +00:00
economy
…
error_handler
…
events
Merge pull request #11093 from Emanthealmighty/Collarchange
2019-03-24 17:56:41 +08:00
examine
Resolve some issues that the compiler doesn't spot
2019-03-29 16:21:15 +01:00
ext_scripts
…
fancytitle
…
fish
Suicide Refactor
2019-03-27 22:54:26 -04:00
flufftext
Resolve some issues that the compiler doesn't spot
2019-03-29 16:21:15 +01:00
food_and_drinks
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-03-30 22:55:09 +01:00
games
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
holiday
…
hydroponics
Suicide Refactor
2019-03-27 22:54:26 -04:00
karma
Revert "Revert "Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2""
2019-03-07 17:43:19 -05:00
library
…
lighting
…
logic
…
map_fluff
…
martial_arts
Crit Rework Final Submission
2019-03-28 17:28:00 -04:00
mining
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-03-30 22:55:09 +01:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-03-30 22:55:09 +01:00
modular_computers
…
nano
…
ninja
…
paperwork
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-03-30 22:55:09 +01:00
pda
…
persistence
…
power
Suicide Refactor
2019-03-27 22:54:26 -04:00
procedural_mapping
Add Beach biodome ruin and other fixes
2019-03-30 22:48:11 +01:00
projectiles
Suicide Refactor
2019-03-27 22:54:26 -04:00
reagents
Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor
2019-03-29 20:28:14 +08:00
recycling
…
research
Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor
2019-03-29 20:28:14 +08:00
response_team
Crit Rework Final Submission
2019-03-28 17:28:00 -04:00
ruins
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-03-30 22:55:09 +01:00
security_levels
…
shuttle
Finish up Lavaland map
2019-03-30 21:08:33 +01:00
space_management
…
spacepods
…
station_goals
…
store
…
surgery
Merge pull request #11151 from Fox-McCloud/suicide-refactor
2019-03-29 20:49:18 +08:00
telesci
…
tooltip
…
tram
…
vehicle
…
vr
…