cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 10:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c4860391b62a46560b612d566daff5ea84fc70d0
VOREStation/code/modules
History
Unknown c4860391b6 Conflict Resolution
2019-04-06 14:47:21 -04:00
..
admin
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
ai
Ports Stasis Cages from Baystation (#6017)
2019-03-30 14:55:52 -04:00
alarm
…
artifice
…
assembly
Merge pull request #4832 from VOREStation/upstream-merge-5985
2019-03-28 21:59:48 -04:00
awaymissions
…
blob
…
blob2
…
busy_space
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
busy_space_vr
Next time, take the easy route
2019-03-30 17:33:54 -04:00
catalogue
Fixes ghosts being counted as contributors for cataloguers. (#6032)
2019-04-05 15:08:10 -04:00
client
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
clothing
Last Minute Fixes
2019-04-05 20:08:06 -04:00
customitems
…
detectivework
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
economy
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
entopics_vr
…
error_handler
…
events
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
examine
…
ext_scripts
…
flufftext
…
food
Merge pull request #4868 from Novacat/nova-weapons
2019-04-05 17:17:53 -04:00
gamemaster
…
games
…
genetics
…
ghosttrap
…
holodeck
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
holomap
…
hydroponics
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10: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
Conflict Resolution
2019-04-06 14:47:21 -04:00
multiz
…
nano
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
nifsoft
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
organs
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
overmap
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
paperwork
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
persistence
…
planet
Ports Weather Improvements
2019-03-29 16:32:07 -04:00
power
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
projectiles
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
random_map
…
reagents
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
recycling
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
research
Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 05:07:05 -04:00
resleeving
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
rogueminer_vr
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
scripting
…
security levels
Adds New Alert Levels (#6019)
2019-03-30 18:29:12 -04:00
shieldgen
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
shuttles
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
spells
…
surgery
Belt-Worn RIGs (#6002)
2019-03-30 03:20:41 -04:00
tables
…
telesci
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
tension
…
tooltip
…
turbolift
Merge pull request #4872 from VOREStation/upstream-merge-6018
2019-03-28 22:10:05 -04:00
vehicles
…
ventcrawl
…
virus2
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
vore
Refactors regeneration of ravenous races
2019-04-04 06:46:25 +01:00
xenoarcheaology
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
xenobio
…
xenobio2
…
xgm
…