cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-30 08:21:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1f243ec4f0ea1b697447da70c925b8519a2e1c06
Paradise/code/modules
T
History
Markolie 1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/_globalvars/lists/objects.dm
2016-12-31 17:54:06 +01:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-23 19:04:35 +01:00
alarm
…
arcade
Fixes up battle terminal connections
2016-12-30 00:12:02 -05:00
assembly
…
atmos_automation
…
awaymissions
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-31 17:54:06 +01:00
client
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo
2016-12-29 21:13:00 -05:00
clothing
Tweaks the listdiff proc to work as prior to avoid runtimes
2016-12-30 00:53:52 -08:00
computer3
Computer3 machines no longer set the user's machine to a datum
2016-12-23 18:09:40 -08:00
countdown
…
crafting
Fixes ED-209 Crafting Oversight
2016-12-13 09:15:03 -05:00
customitems
Adds floof
2016-12-06 11:42:10 +01:00
detective_work
…
economy
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
error_handler
…
events
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-23 19:04:35 +01:00
examine
…
ext_scripts
…
fish
…
flufftext
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
food_and_drinks
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
garbage_collection
....Well i fixed IKEA shuttles anyway....
2016-12-05 22:07:54 -05:00
holiday
…
hydroponics
Fixes a plant splicing runtime
2016-12-30 01:04:59 -08:00
karma
Switching karma back to the "OOC" tab
2016-12-07 16:52:10 +01:00
library
…
lighting
…
logic
…
martial_arts
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
mining
Polishes up the reset_view proc, which is basically
2016-12-21 17:56:57 -08:00
mob
Fixes AIs being blind after a power outage.
2016-12-28 22:28:54 +01:00
nano
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
ninja
…
paperwork
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-31 17:54:06 +01:00
pda
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo
2016-12-29 21:13:00 -05:00
persistence
…
pooling
…
power
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate
2016-12-23 18:58:58 +01:00
procedural_mapping
…
projectiles
Snow Wars Episode II: Attack of the Claus
2016-12-24 02:24:40 -05:00
reagents
Merge pull request #5985 from Fox-McCloud/wall-rot
2016-12-21 17:43:45 -08:00
recycling
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
2016-12-23 07:27:36 -05:00
research
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
2016-12-23 07:27:36 -05:00
ruins
…
scripting
…
security_levels
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-23 19:04:35 +01:00
shuttle
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-31 17:54:06 +01:00
space_management
…
spacepods
Fixes a runtime when attempting to assemble an incomplete pod frame
2016-12-30 00:10:35 -08:00
store
…
surgery
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
2016-12-23 07:27:36 -05:00
telesci
…
tooltip
…
tram
…
vehicle
…