cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-20 03:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
238ea19d09420c5381bbbace7516f440cca0bb12
Paradise/code/modules
History
Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
..
admin
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
alarm
…
antagonists
…
arcade
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
assembly
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
atmos_automation
…
awaymissions
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
buildmode
…
busy_space
…
client
Removes custom admin event info verbs (#12355)
2019-09-20 18:14:06 -07:00
clothing
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
countdown
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
crafting
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
customitems
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-17 11:24:58 -04:00
detective_work
…
economy
…
error_handler
…
events
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
examine
…
ext_scripts
…
fancytitle
…
fish
even-still-though-time-itself-be-shattered
2019-09-16 01:35:25 -04:00
flufftext
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
food_and_drinks
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-17 11:24:58 -04:00
games
…
holiday
…
hydroponics
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
karma
…
keybindings
…
library
…
lighting
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
logic
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
map_fluff
…
martial_arts
…
mining
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
mob
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
modular_computers
even-still-though-time-itself-be-shattered
2019-09-16 01:35:25 -04:00
nano
…
ninja
…
paperwork
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
pda
…
persistence
…
power
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
procedural_mapping
…
projectiles
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
reagents
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
recycling
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
research
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
response_team
…
ruins
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
security_levels
…
shuttle
…
space_management
Removes Unfinished VR (#12341)
2019-09-20 17:58:41 -07:00
spacepods
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
station_goals
Changes station goal crate to engi crates (#12308)
2019-09-18 07:01:31 -07:00
store
…
surgery
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
telesci
…
tooltip
…
tram
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
vehicle
…
zombie
…