cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
933385020fdcfcdab307ac6d07c5c8008b92689c
CHOMPStation2/code/modules
History
izac112 933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
2020-01-31 18:23:50 +01:00
..
admin
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
ai
…
alarm
…
artifice
…
assembly
…
awaymissions
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
2019-11-29 19:13:53 -05:00
blob
…
blob2
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
busy_space
…
busy_space_vr
We're not on Virgo anymore
2019-12-31 04:51:44 -05:00
catalogue
i probably should have tried to compile this before making the PR but i'm not that smart
2019-12-31 05:06:37 -05:00
client
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
clothing
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
customitems
…
detectivework
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
DMAPI
…
economy
Update retail_scanner.dm
2020-01-21 01:12:12 -05:00
entopics_vr
…
error_handler
…
events
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
examine
…
ext_scripts
…
fishing
Adds sharks
2019-12-22 17:32:49 +01:00
flufftext
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
food
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
gamemaster
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
games
…
genetics
…
ghosttrap
…
holodeck
More updates
2019-12-06 18:24:18 -05:00
holomap
Atmos Intake Refactor
2019-12-12 00:48:02 -05:00
hydroponics
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
icon generation
…
identification
…
integrated_electronics
Merge pull request #6616 from Shadow-Quill/Sign-Lang-Translator-Fix
2020-01-15 23:10:43 -05:00
interserver shipping
…
library
Redundant Warning Removed
2020-01-29 12:28:28 -05:00
lighting
…
lore_codex
…
maps
…
materials
…
media
…
metric
…
mining
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
mob
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
modular_computers
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
multi-tile
…
multiz
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
nano
…
nifsoft
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
organs
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
overmap
…
paperwork
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
persistence
…
Phorochemistry
Merge branch 'master' into armalisde
2020-01-18 00:46:32 -05:00
planet
Map atmosphere fixes and cleanup of map defines and code for atmos stuff.
2019-12-02 17:30:40 -05:00
power
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
projectiles
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
radiation
Merge pull request #6623 from Heroman3003/radfix
2020-01-12 18:18:17 -05:00
random_map
…
reagents
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
recycling
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
research
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
resleeving
fixed stupid tab
2020-01-13 20:32:30 +01:00
rogueminer_vr
…
scripting
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
security levels
…
shieldgen
…
shuttles
Moar descriptions for things
2020-01-20 22:50:39 -05:00
spells
…
surgery
513 Compatability
2019-12-12 10:40:27 -05:00
tables
…
telesci
…
tension
…
tooltip
…
turbolift
Moar descriptions for things
2020-01-20 22:50:39 -05:00
vehicles
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
ventcrawl
…
virus2
Moar descriptions for things
2020-01-20 22:50:39 -05:00
vore
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
2020-01-31 18:23:50 +01:00
xenoarcheaology
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
xenobio
…
xenobio2
…
xgm
…