cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c597c9be51aed0fa65b324d0ff105355bfa907a6
Paradise/code/modules
History
Mark van Alphen c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
2019-04-11 07:27:51 +02:00
..
admin
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-10 21:54:54 +02:00
alarm
…
antagonists
The Nations Update Everyone Deserves!
2019-04-06 20:30:04 -04: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
fixed the display names in the loadout to fit alphabetical order better, and adjusted allowed list spacing
2019-04-09 21:12:25 -07:00
clothing
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-11 07:27:51 +02:00
countdown
…
crafting
Port over Corn and affected's work on Lavaland
2019-04-01 23:41:32 +02:00
customitems
Suicide Refactor
2019-03-27 22:54:26 -04:00
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
Suicide Refactor
2019-03-27 22:54:26 -04:00
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
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-04 22:04:55 +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
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
mob
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-11 07:27:51 +02:00
modular_computers
…
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
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +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-04 22:04:55 +02:00
reagents
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-11 07:27:51 +02:00
recycling
target dun exist and user
2019-03-29 09:05:30 +01:00
research
Atmos Define Cleanup + Plasma Tweaks
2019-04-09 11:22:01 -04:00
response_team
Crit Rework Final Submission
2019-03-28 17:28:00 -04:00
ruins
Add seed vault and animal hospital
2019-03-31 23:49:18 +02:00
security_levels
new siren
2019-03-28 22:43:06 -04:00
shuttle
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-02 00:54:49 +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
…