cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-06 04:12:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
e2587dbbbf8bc84d0875e8ae5297f4f95f34f3a1
Paradise/code/modules
History
Markolie e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
2016-12-23 19:04:35 +01:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-23 19:04:35 +01:00
alarm
…
arcade
type-check instead of variable check
2016-09-28 18:57:43 -04:00
assembly
Topic UID finishing touches
2016-09-08 13:07:14 -04:00
atmos_automation
…
awaymissions
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
2016-12-23 19:04:35 +01:00
client
Merge pull request #5962 from KasparoVy/fixes-monochromatic-bugs
2016-12-23 07:19:06 -05:00
clothing
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
2016-12-23 07:27:36 -05:00
computer3
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -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
Integrates UIDs into View Variables
2016-09-08 19:04:50 -04:00
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
…
holiday
…
hydroponics
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
karma
Switching karma back to the "OOC" tab
2016-12-07 16:52:10 +01:00
library
Topic UID finishing touches
2016-09-08 13:07:14 -04:00
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
Fix AI vision
2016-12-23 07:22:59 -08: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-23 19:04:35 +01:00
pda
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
persistence
…
pooling
…
power
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
procedural_mapping
…
projectiles
Merge pull request #5902 from shazbot194/master
2016-11-23 16:26:07 -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-23 19:04:35 +01:00
space_management
…
spacepods
No charge-free shooting for pods, take 2
2016-12-12 13:45:38 +01:00
store
…
surgery
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
2016-12-23 07:27:36 -05:00
telesci
…
tooltip
…
tram
…
vehicle
…