cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
343a8188abb50763d505a8ec86f03e1b7dada003
CHOMPStation2/code/modules
History
Nadyr 343a8188ab Merge pull request #722 from CHOMPStationBot/upstream-merge-9223 
[MIRROR] [MIRROR] Fix blood from artifacts breaking the pathogenic isolator
2020-10-22 09:54:04 -04:00
..
admin
Chompedit tags
2020-10-08 12:30:52 -07:00
ai
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
alarm
…
artifice
…
assembly
…
asset_cache
Recompile nanomaps, and add nanomap improvements
2020-09-25 03:52:49 -07:00
awaymissions
Fixing conflicts
2020-10-05 18:10:53 -07:00
blob
…
blob2
…
busy_space
…
busy_space_vr
…
busy_space_yw
…
catalogue
…
client
Merge pull request #9241 from VOREStation/upstream-merge-7733
2020-10-19 10:36:41 +00:00
clothing
Merge pull request #706 from CHOMPStationBot/upstream-merge-9232
2020-10-19 18:12:16 -07:00
customitems
…
detectivework
…
DMAPI
…
economy
Fixing conflicts
2020-10-05 18:10:53 -07:00
entopics_vr
…
error_handler
…
events
Fixing conflicts
2020-10-05 18:10:53 -07:00
examine
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
ext_scripts
…
fishing
…
flufftext
…
food
Merge pull request #718 from CHOMPStationBot/upstream-merge-9228
2020-10-22 09:27:16 -04:00
gamemaster
Fixing conflicts
2020-10-05 18:10:53 -07:00
games
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
genetics
…
ghosttrap
…
holodeck
…
holomap
…
hydroponics
Fixing conflicts
2020-10-05 18:10:53 -07:00
icon generation
…
identification
…
integrated_electronics
Fixing conflicts
2020-10-05 18:10:53 -07:00
interserver shipping
…
library
Fixes #8592
2020-09-29 01:18:06 -04:00
lighting
…
looking_glass
Fixing conflicts
2020-10-05 18:10:53 -07:00
lore_codex
…
maps
Fixing the work of a moron.
2020-10-05 17:55:48 -04:00
materials
Fix silly stuff
2020-10-05 19:46:50 -07:00
media
Fixing conflicts
2020-10-05 18:10:53 -07:00
metric
…
mining
Fixing conflicts
2020-10-05 18:10:53 -07:00
mob
Merge pull request #714 from CHOMPStationBot/upstream-merge-9234
2020-10-22 09:30:52 -04:00
modular_computers
Fixing conflicts
2020-10-05 18:10:53 -07:00
multi-tile
…
multiz
Fixing conflicts
2020-10-05 18:10:53 -07:00
nano
Fix silly stuff
2020-10-05 19:46:50 -07:00
nifsoft
Do this later
2020-10-08 18:47:01 -07:00
organs
Fixing conflicts
2020-10-05 18:10:53 -07:00
overmap
Fixing conflicts
2020-10-05 18:10:53 -07:00
paperwork
Fixing conflicts
2020-10-05 18:10:53 -07:00
pda
Fix silly stuff
2020-10-05 19:46:50 -07:00
persistence
Fixing conflicts
2020-10-05 18:10:53 -07:00
Phorochemistry
…
planet
…
power
Fixing conflicts
2020-10-05 18:10:53 -07:00
projectiles
Xenomorph Balancing Act 1.1
2020-10-10 21:27:48 -04:00
radiation
Merge pull request #9208 from VOREStation/upstream-merge-7696
2020-10-19 10:38:00 +00:00
random_map
…
reagents
Merge pull request #712 from CHOMPStationBot/upstream-merge-9087
2020-10-22 09:03:00 -04:00
recycling
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
research
Fixing conflicts
2020-10-05 18:10:53 -07:00
resleeving
Fixing conflicts
2020-10-05 18:10:53 -07:00
rogueminer_vr
…
scripting
…
security levels
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
shieldgen
…
shuttles
Fixing conflicts
2020-10-05 18:10:53 -07:00
spells
…
surgery
Fixing the work of a moron.
2020-10-05 17:55:48 -04:00
tables
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
telesci
TGUI Telesci
2020-09-19 20:20:26 -07:00
tension
…
tgs
…
tgui
Fix silly stuff
2020-10-05 19:46:50 -07:00
tooltip
…
turbolift
Finally setting up the PR bot
2020-10-14 21:14:38 -07:00
vchat
Merge pull request #559 from cadyn/tempbsfix
2020-10-06 01:11:53 -06:00
vehicles
Fixing conflicts
2020-10-05 18:10:53 -07:00
ventcrawl
…
virus2
Merge pull request #9223 from VOREStation/upstream-merge-7705
2020-10-19 10:39:37 +00:00
vore
Finally setting up the PR bot
2020-10-14 21:14:38 -07:00
xenoarcheaology
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
xenobio
…
xenobio2
…
xgm
…