cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-03 04:26:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
238ea19d09420c5381bbbace7516f440cca0bb12
Paradise/code/modules
T
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
Foxes ATM withdrawls
2019-09-01 12:43:29 -05:00
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
then-we-shall-reforge-the-armor-from-what-remains
2019-09-10 07:03:05 -04:00
hydroponics
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
karma
Fixes Plasmaman Karma Displayed Cost
2019-08-25 18:49:11 -04:00
keybindings
semi-mirror TG PR 46425
2019-09-11 16:13:35 -07:00
library
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
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
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
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
LET THERE BE LIFE!
2019-08-19 16:35:20 -05:00
ninja
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
paperwork
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
pda
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
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
Implements Tailoring
2019-08-26 17:41:39 -04:00
ruins
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
security_levels
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
shuttle
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
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
Initial commit
2019-09-07 19:06:57 +02:00
tooltip
…
tram
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
vehicle
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
zombie
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00