cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c45d7c2196e7a7127b4752ecc81f980171fe110b
CHOMPStation2/code/modules
History
Repede c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
2020-03-01 12:35:52 -05:00
..
admin
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
ai
Merge pull request #6733 from VOREStation/pol-aitweaks
2020-02-26 20:16:06 -05:00
alarm
…
artifice
…
assembly
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
awaymissions
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
blob
…
blob2
…
busy_space
…
busy_space_vr
…
busy_space_yw
2 new sdf events
2020-02-16 23:41:46 +00:00
catalogue
Adds grey to cataloguer, adds blurb, minor change in telep, adds spawn
2020-02-25 14:15:09 -03:00
client
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
clothing
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
customitems
…
detectivework
Merge pull request #6592 from VOREStation/vchat-rebase
2020-03-01 10:51:29 -05:00
DMAPI
…
economy
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
entopics_vr
…
error_handler
…
events
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
examine
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
ext_scripts
…
fishing
…
flufftext
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
food
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
gamemaster
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
games
Ports precision placement of items
2020-02-22 02:35:41 -05:00
genetics
…
ghosttrap
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
holodeck
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
holomap
…
hydroponics
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
icon generation
…
identification
…
integrated_electronics
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
interserver shipping
…
library
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
lighting
…
lore_codex
edit comments
2020-02-16 06:34:09 +00:00
maps
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
materials
Merge pull request #6647 from VOREStation/aro-table
2020-03-01 10:54:31 -05:00
media
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
metric
…
mining
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
mob
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
modular_computers
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
multi-tile
…
multiz
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
nano
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
nifsoft
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
organs
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
overmap
…
paperwork
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
persistence
…
Phorochemistry
Fixes the basic collars to work on teshari using the poncho abuse system, totally ready to break them fluff collars.
2020-02-28 22:48:07 -05:00
planet
…
power
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
projectiles
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
radiation
…
random_map
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
reagents
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05: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 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
resleeving
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
rogueminer_vr
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
scripting
…
security levels
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
shieldgen
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
shuttles
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
spells
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
surgery
Earlyports rig surgery fix
2020-03-01 00:48:49 -05:00
tables
Merge pull request #6647 from VOREStation/aro-table
2020-03-01 10:54:31 -05:00
telesci
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
tension
…
tooltip
…
turbolift
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
vchat
Cleanup the DB in case it wasn't deleted each roundstart
2020-02-29 15:02:54 -05:00
vehicles
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
ventcrawl
…
virus2
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
vore
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
xenoarcheaology
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-03-01 12:35:52 -05:00
xenobio
Merge pull request #6592 from VOREStation/vchat-rebase
2020-03-01 10:51:29 -05:00
xenobio2
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
xgm
…