cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
1519496d9f1c794cba044de6064c836c3d166516
CHOMPStation2/code/modules
History
Novacat 1519496d9f Merge pull request #4849 from VOREStation/upstream-merge-5978 
[MIRROR] Unpicks some mining spaghetti
2019-03-28 22:01:36 -04:00
..
admin
…
ai
Fixes blast door issue, and slimesky being considered unjustified.
2019-03-28 20:35:17 -04:00
alarm
…
artifice
…
assembly
Merge pull request #4832 from VOREStation/upstream-merge-5985
2019-03-28 21:59:48 -04:00
awaymissions
…
blob
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
blob2
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
busy_space
…
busy_space_vr
…
client
Merge pull request #4842 from VOREStation/upstream-merge-5988
2019-03-28 22:00:38 -04:00
clothing
Merge pull request #4841 from VOREStation/upstream-merge-5992
2019-03-28 22:00:31 -04:00
customitems
…
detectivework
…
economy
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
entopics_vr
…
error_handler
…
events
…
examine
…
ext_scripts
…
flufftext
…
food
Merge pull request #4844 from VOREStation/upstream-merge-5991
2019-03-28 22:01:05 -04:00
gamemaster
…
games
…
genetics
…
ghosttrap
…
holodeck
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
holomap
…
hydroponics
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
icon generation
…
identification
…
integrated_electronics
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
library
…
lighting
…
lore_codex
…
maps
Merge pull request #4789 from VOREStation/upstream-merge-5967
2019-03-28 21:08:01 -04:00
materials
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
media
…
metric
…
mining
Merge pull request #4849 from VOREStation/upstream-merge-5978
2019-03-28 22:01:36 -04:00
mob
Removes conductive flags from VR stuff
2019-03-28 21:45:38 -04:00
multiz
Merge pull request #4739 from VOREStation/upstream-merge-5924
2019-03-28 17:55:27 -04:00
nano
Merge pull request #4775 from VOREStation/upstream-merge-5961
2019-03-28 20:24:38 -04:00
nifsoft
…
organs
Merge pull request #4843 from VOREStation/upstream-merge-5993
2019-03-28 22:00:55 -04:00
overmap
…
paperwork
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
persistence
…
planet
…
power
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
projectiles
Merge pull request #4849 from VOREStation/upstream-merge-5978
2019-03-28 22:01:36 -04:00
random_map
…
reagents
Merge branch 'master' into upstream-merge-5991
2019-03-28 21:35:54 -04:00
recycling
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
research
Changes (R&D made) Saber SMG to Advanced SMG
2019-03-28 18:22:23 -04:00
resleeving
Merge pull request #4837 from Heroman3003/borg-sleever-interaction
2019-03-28 22:00:14 -04:00
rogueminer_vr
…
scripting
…
security levels
…
shieldgen
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
shuttles
…
spells
…
surgery
…
tables
Conflict Resolution
2019-03-28 19:41:16 -04:00
telesci
…
tension
…
tooltip
…
turbolift
…
vehicles
…
ventcrawl
…
virus2
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
vore
Removes conductive flags from VR stuff
2019-03-28 21:45:38 -04:00
xenoarcheaology
…
xenobio
…
xenobio2
…
xgm
…