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
7fef96e38df2aec8220a920f4cd44e0d2a92a9f3
Paradise/code/modules
History
Mark van Alphen 7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
2019-04-21 23:27:23 +02:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-21 23:27:23 +02:00
alarm
…
antagonists
Merge pull request #11259 from Markolie/flukeops
2019-04-18 07:16:31 +08:00
arcade
…
assembly
…
atmos_automation
…
awaymissions
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
buildmode
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
busy_space
…
client
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
clothing
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-21 23:27:23 +02:00
countdown
…
crafting
Port over Corn and affected's work on Lavaland
2019-04-01 23:41:32 +02:00
customitems
…
detective_work
…
discord
…
economy
…
error_handler
…
events
Merge pull request #11179 from Ty-Omaha/grid-check
2019-04-02 18:16:15 -04:00
examine
Merge pull request #11170 from Fox-McCloud/trick-revolver
2019-04-02 18:33:24 +08:00
ext_scripts
…
fancytitle
…
fish
…
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-04-04 22:04:55 +02:00
games
…
holiday
…
hydroponics
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
karma
…
library
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
lighting
…
logic
…
map_fluff
…
martial_arts
more hit type verbs
2019-04-09 21:57:47 -04:00
mining
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-21 23:27:23 +02:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-21 23:27:23 +02:00
modular_computers
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
nano
…
ninja
…
paperwork
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
pda
…
persistence
…
power
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-17 22:46:43 +02:00
procedural_mapping
Add Beach biodome ruin and other fixes
2019-03-30 22:48:11 +01:00
projectiles
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-18 03:15:52 +02:00
reagents
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-17 22:46:43 +02:00
recycling
…
research
Merge pull request #11243 from CornMyCob/plasmacutter-buff
2019-04-18 07:35:27 +08:00
response_team
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
ruins
no_lava fix, make sure simple explosions don't nuke the Syndicate base
2019-04-20 03:09:13 +02:00
security_levels
…
shuttle
Remove white shuttle landing spot
2019-04-17 22:40:08 +02:00
space_management
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
spacepods
…
station_goals
…
store
…
surgery
tweak
2019-04-09 11:32:21 -04:00
telesci
…
tooltip
…
tram
…
vehicle
Largely finish up beach ruin
2019-03-31 00:20:27 +01:00
vr
…