cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d03f4dcafb157837b5019911e66b7a070ae43303
Paradise/code/modules
History
Mark van Alphen d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
2019-07-08 19:36:30 +02:00
..
admin
Merge pull request #11619 from Tayyyyyyy/scrolling_messages
2019-07-08 20:23:37 +08:00
alarm
…
antagonists
Merge https://github.com/ParadiseSS13/Paradise into WizardRevenge
2019-05-13 22:21:48 +02:00
arcade
…
assembly
…
atmos_automation
…
awaymissions
Die of Fate fixes
2019-06-07 02:33:08 +02:00
buildmode
…
busy_space
…
client
Merge pull request #11608 from Markolie/ghostpda
2019-07-08 20:22:42 +08:00
clothing
Merge pull request #11544 from Arkatos1/recharger
2019-07-08 20:18:36 +08:00
countdown
…
crafting
…
customitems
Switch to material glasses
2019-05-06 05:47:49 +02:00
detective_work
…
economy
Removes unused hooks
2019-05-05 10:28:56 +01:00
error_handler
…
events
Tesla wormhole fix
2019-06-06 17:14:34 +02:00
examine
…
ext_scripts
removes ircNotify
2019-05-30 13:49:46 -07:00
fancytitle
…
fish
…
flufftext
…
food_and_drinks
Merge pull request #11613 from Arkatos1/smartfridge_ascension
2019-07-08 20:23:11 +08:00
games
…
holiday
…
hydroponics
fixes bug with biogenerator
2019-07-04 12:41:39 -07:00
karma
…
library
Random bookcase fix
2019-05-31 23:16:02 +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 ruinsport
2019-07-08 19:36:30 +02:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
2019-07-08 19:36:30 +02:00
modular_computers
added get_cell() proc to remaining items using cells
2019-05-18 23:52:18 +02:00
nano
Ruin fixes
2019-06-07 02:03:19 +02:00
ninja
Merge pull request #11544 from Arkatos1/recharger
2019-07-08 20:18:36 +08:00
paperwork
Merge pull request #11562 from Tayyyyyyy/markdown
2019-07-08 20:20:46 +08:00
pda
Re-add ghost PDA messages
2019-05-27 20:50:42 +02:00
persistence
…
power
Merge pull request #11544 from Arkatos1/recharger
2019-07-08 20:18:36 +08:00
procedural_mapping
…
projectiles
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
2019-07-08 19:36:30 +02:00
reagents
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
2019-07-08 19:36:30 +02:00
recycling
Merge pull request #11591 from Citinited/fuck-you-disposals
2019-06-28 21:04:24 +08:00
research
Merge pull request #11738 from evankhellparadise/portableseed
2019-06-29 09:23:22 +08:00
response_team
Merge pull request #11486 from Tayyyyyyy/better_ert_spawn
2019-05-17 23:07:30 +08:00
ruins
Ruin fixes
2019-06-07 02:03:19 +02:00
security_levels
Merge pull request #11552 from Markolie/gammaborg
2019-05-27 18:14:54 +08:00
shuttle
More portal fixes
2019-06-03 21:57:00 +02:00
space_management
…
spacepods
added get_cell() proc to remaining items using cells
2019-05-18 23:52:18 +02:00
station_goals
…
store
…
surgery
Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix
2019-06-03 17:39:23 +02:00
telesci
Merge pull request #11544 from Arkatos1/recharger
2019-07-08 20:18:36 +08:00
tooltip
…
tram
More portal fixes
2019-06-03 21:57:00 +02:00
vehicle
…
vr
Remove unused species_fit and move chameleon file
2019-05-05 20:37:53 +02:00