cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-02 11:01:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e28994b7be9bfe0bdc5aca3bbfe3f0c64ca393ca
CHOMPStation2/code/modules
T
History
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
..
admin
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
ai
Fixy fix slems
2020-05-03 13:00:30 -04:00
alarm
Merge VS changes for telecomms
2020-04-29 10:24:37 -04:00
artifice
…
assembly
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
awaymissions
…
blob
…
blob2
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
busy_space
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
busy_space_yw
…
catalogue
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
client
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
clothing
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
customitems
…
detectivework
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
DMAPI
revering back to collar commit
2019-03-11 23:13:04 -04:00
economy
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
entopics_vr
…
error_handler
Fix error handler printing bogus src.loc and usr.loc info
2020-03-30 20:30:36 -04:00
events
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
examine
…
ext_scripts
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
fishing
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
flufftext
…
food
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
gamemaster
Merge pull request #7046 from Neerti/system_3_fixes
2020-04-29 17:27:57 -04:00
games
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
genetics
…
ghosttrap
…
holodeck
Fix remaining code that directly modified use_power to call update_use_power.
2020-04-22 20:47:15 -04:00
holomap
…
hydroponics
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
icon generation
…
identification
…
integrated_electronics
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
interserver shipping
…
library
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
lighting
Refactor move code
2020-04-26 16:42:50 -04:00
looking_glass
Release Update
2020-04-16 21:07:33 -04:00
lore_codex
…
maps
…
materials
Explorer Expansion: New Horizons
2020-05-01 14:20:29 -04:00
media
VS: Clean up lastarea garbo
2020-04-30 15:43:08 -04:00
metric
Merge pull request #7032 from atlantiscze/2020_04_22_ShellExclude
2020-04-25 15:56:37 -04:00
mining
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
mob
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
modular_computers
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
multi-tile
Allow fighters to traverse overmap ships predictably
2020-04-14 15:56:40 -04:00
multiz
MultiZ Pulling Fixes
2020-05-03 09:49:25 -04:00
nano
Add UAV, UAV software
2020-04-28 23:18:08 -04:00
nifsoft
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
organs
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
overmap
Update ships, add ATTRIBUTIONS.md
2020-05-04 14:27:46 -04:00
paperwork
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
persistence
…
Phorochemistry
…
planet
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
power
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
projectiles
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
radiation
…
random_map
…
reagents
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
recycling
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
research
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
resleeving
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
rogueminer_vr
…
scripting
Fixed merge conflicts and errors, everything seems to work
2020-04-23 18:25:25 -07:00
security levels
Port SSnightshift from Paradise
2020-05-03 17:51:05 -04:00
shieldgen
Merge examine refactor for vorestation
2020-04-29 17:49:54 -04:00
shuttles
Replace/Add lots of sounds from VerySoft
2020-05-05 22:43:31 -04:00
spells
Removes limits on eating, centralizes nutrition changing.
2020-04-29 17:15:15 -04:00
surgery
Allows do_mob and do_after to be exclusive, to prevent stacking
2020-05-05 19:10:55 -04:00
tables
Port Bay's Catwalks
2020-05-01 13:00:39 -04:00
telesci
Merge examine refactor for vorestation
2020-04-29 17:49:54 -04:00
tension
…
tooltip
…
turbolift
…
vchat
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
vehicles
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
ventcrawl
…
virus2
Merge pull request #7516 from VOREStation/upstream-merge-7045
2020-04-29 19:23:55 -04:00
vore
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
xenoarcheaology
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-06 21:53:03 +02:00
xenobio
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
xenobio2
Merge nutrition refactor for vorestation
2020-04-29 18:34:22 -04:00
xgm
…