cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d6a852bcfa226d0b06cc85aaf8d9cb0c7425737c
Paradise/code/modules
History
tigercat2000 d6a852bcfa Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	code/game/mecha/mecha.dm
2018-11-01 08:37:46 -07:00
..
admin
Not quite done yet
2018-10-30 22:57:42 -07:00
alarm
…
antagonists
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
arcade
Fixes adjacency issues with merch shop, arcade shop and give command
2018-10-30 23:21:57 +00:00
assembly
Cleans up assembly code
2018-10-27 13:29:07 +01:00
atmos_automation
Merge branch 'master' into RelPath
2018-10-12 14:08:19 +08:00
awaymissions
Merge pull request #9719 from SamHPurp/smoothing-improvements
2018-10-21 07:41:47 +08:00
buildmode
Re-implements BM offsets in a 511-compatible manner
2018-10-16 20:10:03 -07:00
busy_space
…
client
Revert "(TGCRP) - /tg/ catgirl refugee program"
2018-10-27 13:06:42 +08:00
clothing
Revert "(TGCRP) - /tg/ catgirl refugee program"
2018-10-27 13:06:42 +08:00
countdown
…
crafting
TG container_type refactor
2018-10-13 08:20:52 +08:00
customitems
Resolves conflicts.
2018-10-11 05:36:22 -05:00
detective_work
TG container_type refactor
2018-10-13 08:20:52 +08:00
economy
…
error_handler
…
events
Merge pull request #9888 from Fox-McCloud/spark-refactor
2018-10-19 08:41:03 +08:00
examine
fixies
2018-10-11 22:02:23 +01:00
ext_scripts
…
fancytitle
…
fish
Deconflict 1
2018-10-21 07:56:55 +08:00
flufftext
Resolves conflicts.
2018-10-11 05:36:22 -05:00
food_and_drinks
New Oil Can Sprite
2018-10-26 15:06:40 -04:00
games
…
holiday
…
hydroponics
Update chili.dm
2018-10-29 16:12:28 -04:00
karma
…
library
…
lighting
Revert "(TGCRP) - /tg/ catgirl refugee program"
2018-10-27 13:06:42 +08:00
logic
…
map_fluff
…
martial_arts
moves boxing attack logs to the ALL preference
2018-10-12 23:28:04 -04:00
mining
Merge pull request #9864 from variableundefined/ManualRevert
2018-10-19 19:16:00 -04:00
mob
Merge remote-tracking branch 'upstream/master' into mechastuff
2018-11-01 08:37:46 -07:00
modular_computers
Fixed it
2018-10-24 22:54:14 +02:00
nano
Resolves conflicts.
2018-10-11 05:36:22 -05:00
ninja
…
paperwork
Merge pull request #10062 from Dave-TH/paper_fix
2018-10-30 10:53:58 +08:00
pda
…
persistence
…
power
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
procedural_mapping
…
projectiles
Deconflict 1
2018-10-21 07:56:55 +08:00
reagents
Fixes Rewriter drink description typo
2018-10-31 14:23:04 +01:00
recycling
kills another nullspace bug
2018-10-31 22:08:54 +00:00
research
Merge pull request #9081 from tigercat2000/multivis
2018-10-25 09:45:02 +08:00
response_team
adds nullrod to gamma paranormal
2018-10-12 15:41:06 +01:00
ruins
…
scripting
…
security_levels
Resolves conflicts.
2018-10-11 05:36:22 -05:00
shuttle
Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements
2018-10-13 21:34:04 +01:00
space_management
…
spacepods
Items dropped in a pod will now stay in the pod.
2018-10-29 20:31:11 +01:00
station_goals
Merge pull request #9814 from Agameofscones/DNA_sampler_QOL
2018-10-19 07:44:37 +08:00
store
…
surgery
Revert "(TGCRP) - /tg/ catgirl refugee program"
2018-10-27 13:06:42 +08:00
telesci
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
tooltip
…
tram
…
vehicle
…
vr
Resolves conflicts.
2018-10-11 05:36:22 -05:00