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
7fc7803e53b7c490e3a3b649d8d38bb97f106c28
CHOMPStation2/code/modules
History
Repede 3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
..
admin
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-18 16:05:36 +02:00
ai
Nullify ai_log statements unless someone comments this out
2020-05-17 10:00:45 -04:00
alarm
…
artifice
…
assembly
Obsolete the PROXMOVE flag and uses
2020-05-18 13:31:54 -04:00
awaymissions
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
2020-05-18 20:30:52 -04:00
blob
…
blob2
…
busy_space
…
busy_space_yw
…
catalogue
…
client
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
2020-05-18 20:30:52 -04:00
clothing
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 23:26:52 +02:00
customitems
…
detectivework
…
DMAPI
…
economy
…
entopics_vr
…
error_handler
…
events
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-13 10:21:49 +02:00
examine
…
ext_scripts
…
fishing
…
flufftext
…
food
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-18 16:05:36 +02:00
gamemaster
…
games
…
genetics
…
ghosttrap
…
holodeck
…
holomap
…
hydroponics
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
2020-05-18 20:30:52 -04:00
icon generation
…
identification
…
integrated_electronics
Just remove on_loc_moved entirely
2020-05-18 15:13:20 -04:00
interserver shipping
…
library
…
lighting
…
looking_glass
…
lore_codex
…
maps
…
materials
…
media
…
metric
…
mining
…
mob
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
2020-05-18 20:30:52 -04:00
modular_computers
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-13 10:21:49 +02:00
multi-tile
…
multiz
Merge upstream PR
2020-05-18 09:31:51 -04:00
nano
…
nifsoft
…
organs
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-18 16:05:36 +02:00
overmap
…
paperwork
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 23:26:52 +02:00
persistence
…
Phorochemistry
…
planet
…
power
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
2020-05-18 20:30:52 -04:00
projectiles
Merge branch 'master' into izac-voreupdate
2020-05-16 09:02:59 +02:00
radiation
…
random_map
…
reagents
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
2020-05-18 20:30:52 -04:00
recycling
…
research
Merge branch 'master' into izac-voreupdate
2020-05-13 09:16:09 +02:00
resleeving
…
rogueminer_vr
…
scripting
…
security levels
Adds holoposter ads
2020-05-17 17:54:32 -04:00
shieldgen
Just remove on_loc_moved entirely
2020-05-18 15:13:20 -04:00
shuttles
…
spells
…
surgery
Ported /tg/ style screen alerts, replacing the hunger icon with them
2020-05-13 19:36:01 -07:00
tables
…
telesci
…
tension
…
tgs
Merge upstream PR
2020-05-18 09:31:51 -04:00
tooltip
…
turbolift
…
vchat
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 23:26:52 +02:00
vehicles
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 23:26:52 +02:00
ventcrawl
…
virus2
…
vore
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
2020-05-18 20:30:52 -04:00
xenoarcheaology
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-13 10:21:49 +02:00
xenobio
…
xenobio2
…
xgm
…