cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
8c8950bf07cd90560d12e980a0c8df3d9eaa95df
Paradise/code/modules
History
Mark van Alphen 8c8950bf07 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
2019-07-15 20:37:44 +02:00
..
admin
Diagonal tweaks
2019-07-12 06:00:19 -04:00
alarm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
antagonists
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
arcade
Resolve conflicts
2019-05-03 22:28:04 -04:00
assembly
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-04-25 23:45:08 -04:00
atmos_automation
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
awaymissions
Add shuttle chairs (and fix newlines on all maps)
2019-06-07 03:39:24 +02:00
buildmode
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
busy_space
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
client
Remove unused winsets
2019-07-11 01:01:22 -04:00
clothing
Merge pull request #11125 from Quantum-M/editVampireMuzzle
2019-07-09 18:15:42 +08:00
countdown
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
crafting
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
customitems
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
detective_work
…
economy
Removes unused hooks
2019-05-05 10:28:56 +01:00
error_handler
…
events
Update disease_outbreak.dm
2019-07-11 02:36:30 -04:00
examine
…
ext_scripts
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
fancytitle
…
fish
…
flufftext
Resolve conflicts
2019-05-03 22:28:04 -04:00
food_and_drinks
Merge pull request #11613 from Arkatos1/smartfridge_ascension
2019-07-08 20:23:11 +08:00
games
…
holiday
SSevents & SSholiday
2019-04-23 10:55:36 +01:00
hydroponics
fixes bug with biogenerator
2019-07-04 12:41:39 -07:00
karma
SSticker
2019-04-30 16:47:47 +01:00
keybindings
QoL adjustments
2019-07-12 18:09:37 -04:00
library
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
lighting
Fix dynamic lighting on shuttles
2019-05-04 05:51:13 +02:00
logic
SScommunications
2019-04-21 20:12:14 +01:00
map_fluff
…
martial_arts
…
mining
Merge pull request #11358 from Couls/diagonal-movement
2019-07-12 17:12:57 +08:00
mob
Merge pull request #11687 from Kyep/you_have_time
2019-07-12 18:20:34 +08:00
modular_computers
added get_cell() proc to remaining items using cells
2019-05-18 23:52:18 +02:00
nano
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
ninja
Merge pull request #11544 from Arkatos1/recharger
2019-07-08 20:18:36 +08:00
paperwork
Merge pull request #11562 from Tayyyyyyy/markdown
2019-07-08 20:20:46 +08:00
pda
Re-add ghost PDA messages
2019-05-27 20:50:42 +02:00
persistence
…
power
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-08 10:13:15 -04:00
procedural_mapping
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
projectiles
Merge pull request #11684 from IAmBigCoat/medbeamwarnings
2019-07-12 18:17:07 +08:00
reagents
Merge pull request #11731 from Couls/patch-2
2019-07-08 20:26:38 +08:00
recycling
Merge pull request #11591 from Citinited/fuck-you-disposals
2019-06-28 21:04:24 +08:00
research
Merge pull request #11738 from evankhellparadise/portableseed
2019-06-29 09:23:22 +08:00
response_team
Merge pull request #11486 from Tayyyyyyy/better_ert_spawn
2019-05-17 23:07:30 +08:00
ruins
Fix mask path
2019-06-03 22:59:15 +02:00
security_levels
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
shuttle
More portal fixes
2019-06-03 21:57:00 +02:00
space_management
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
spacepods
More testmerge fixes and improvements
2019-07-09 07:59:12 -04:00
station_goals
SSticker
2019-04-30 16:47:47 +01:00
store
…
surgery
Merge pull request #11653 from Couls/bone-rework
2019-07-12 18:15:17 +08:00
telesci
Merge pull request #11634 from Markolie/laborstacker
2019-07-09 18:21:58 +08:00
tooltip
…
tram
More portal fixes
2019-06-03 21:57:00 +02:00
vehicle
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
vr
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00