cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
4cf7f71be6d1720990445cb41ff187d3a5fcd2c5
CHOMPStation2/code/modules
History
Repede 4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
..
admin
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
ai
…
alarm
…
artifice
…
assembly
Deprecate the stream operator
2020-02-12 19:38:43 -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
…
client
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
clothing
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
customitems
…
detectivework
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
DMAPI
…
economy
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
entopics_vr
…
error_handler
…
events
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
examine
…
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-02-22 12:38:04 -05:00
gamemaster
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
games
…
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-02-22 12:38:04 -05:00
icon generation
…
identification
…
integrated_electronics
…
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
Deprecate the stream operator
2020-02-12 19:38:43 -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-02-22 12:38:04 -05:00
mob
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
modular_computers
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -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-02-22 12:38:04 -05:00
organs
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
overmap
…
paperwork
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
persistence
…
Phorochemistry
Rad-X Overdose is now 45 so you cant just fill yourself with infinite ammounts and it now metabs because they are not nanites that avoids your bodies bodily functions until they detect radiation
2020-02-07 17:53:24 +01:00
planet
…
power
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
projectiles
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -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-02-22 12:38:04 -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-02-22 12:38:04 -05:00
resleeving
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -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
Deprecate the stream operator
2020-02-12 19:38:43 -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
More fixes for broken medical
2020-02-19 08:35:37 +10:00
tables
Deprecate the stream operator
2020-02-12 19:38:43 -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
vehicles
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
ventcrawl
…
virus2
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
vore
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
xenoarcheaology
Merge branch 'release' of https://github.com/VOREStation/VOREStation
2020-02-22 12:38:04 -05:00
xenobio
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
xenobio2
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
xgm
…