cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f2497afd9d1cd864c2f705ca1da680c4f172a7bd
Paradise/code/modules
History
Markolie f2497afd9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals 
# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi
2017-02-05 20:12:51 +01:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
2017-02-05 20:12:51 +01:00
alarm
…
arcade
…
assembly
…
atmos_automation
…
awaymissions
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
2017-02-05 20:12:51 +01:00
client
Merge pull request #6152 from uraniummeltdown/windowflash
2017-01-31 01:30:39 -05:00
clothing
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
computer3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
countdown
…
crafting
fixes a ton of thing
2017-01-24 03:23:16 -05:00
customitems
Adds a fluff item for ComputerlessCitizen
2017-01-10 14:31:27 +01:00
detective_work
…
economy
…
error_handler
…
events
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
examine
…
ext_scripts
…
fish
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
flufftext
…
food_and_drinks
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
garbage_collection
Removes Oudated GC Info
2017-01-30 03:01:29 -05:00
holiday
…
hydroponics
fungus among us
2017-02-04 05:01:03 -05:00
karma
…
library
Makes new book sprites available for Bookbinder
2017-01-16 19:43:14 +01:00
lighting
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
logic
…
martial_arts
…
mining
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
2017-02-05 20:12:51 +01:00
nano
Fixes both pai resting jankiness, pai body re-entering
2017-01-09 15:14:26 -08:00
ninja
…
paperwork
Merge pull request #5814 from Markolie/ann2
2017-01-18 19:17:30 -08:00
pda
…
persistence
…
power
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
procedural_mapping
…
projectiles
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
reagents
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
recycling
Merge pull request #6178 from FalseIncarnate/NTPS
2017-01-31 01:26:21 -05:00
research
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
ruins
…
scripting
…
security_levels
Merge pull request #5814 from Markolie/ann2
2017-01-18 19:17:30 -08:00
shuttle
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
2017-02-05 20:12:51 +01:00
space_management
…
spacepods
Switches over to the new system
2017-01-17 13:57:07 +01:00
station_goals
Final touches to station goals
2017-01-25 16:14:40 +01:00
store
…
surgery
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
telesci
…
tooltip
…
tram
Switches over to the new system
2017-01-17 13:57:07 +01:00
vehicle
…