cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d2a2b301cc261a83721b74ccd2238ad2682fdeb3
CHOMPStation2/code/modules
History
cadyn d2a2b301cc Merge pull request #829 from cadyn/traits-v2 
Cadyn's traits v2
2020-11-15 00:54:35 -08:00
..
admin
give mods quick nif privvys
2020-11-09 10:47:57 -08:00
ai
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
alarm
…
artifice
…
assembly
…
asset_cache
13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation
2020-10-20 03:19:38 +00:00
awaymissions
Fixing conflicts
2020-10-05 18:10:53 -07:00
blob
…
blob2
…
busy_space
…
busy_space_vr
…
busy_space_yw
…
catalogue
…
client
Another move.
2020-11-10 00:06:36 -05:00
clothing
Merge pull request #9290 from VOREStation/upstream-merge-7751
2020-11-08 06:58:52 +00:00
customitems
…
detectivework
…
DMAPI
…
economy
Fixing conflicts
2020-10-05 18:10:53 -07:00
entopics_vr
…
error_handler
…
events
Spicy Engineering :o
2020-11-13 04:35:15 -08:00
examine
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
ext_scripts
…
fishing
…
flufftext
…
food
Merge pull request #829 from cadyn/traits-v2
2020-11-15 00:54:35 -08: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
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
holomap
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
hydroponics
Merge branch 'master' into KotetsuRedwood-CinnamonStuff
2020-11-05 16:09:29 -07:00
icon generation
…
identification
…
integrated_electronics
Yummy bugfixes
2020-10-27 19:58:49 -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
Merge pull request #817 from CHOMPStationBot/upstream-merge-9287
2020-11-08 23:41:34 -07:00
media
Fixing conflicts
2020-10-05 18:10:53 -07:00
metric
…
mining
Merge pull request #771 from CHOMPStationBot/upstream-merge-9260
2020-10-28 21:14:21 -07:00
mob
Merge pull request #829 from cadyn/traits-v2
2020-11-15 00:54:35 -08:00
modular_computers
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00: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
Merge pull request #757 from r4d6/Synth-Medichine
2020-10-29 16:59:16 -07:00
organs
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 17:04:32 +00:00
overmap
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00: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
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
Phorochemistry
…
planet
…
power
Merge pull request #760 from CHOMPStationBot/upstream-merge-9225
2020-10-27 02:15:15 -07:00
projectiles
Merge pull request #788 from cadyn/ballistics-v2
2020-11-11 19:32:40 -07:00
radiation
Merge pull request #9208 from VOREStation/upstream-merge-7696
2020-10-19 10:38:00 +00:00
random_map
…
reagents
Cadyn's traits v2
2020-11-11 12:34:31 -08:00
recycling
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
research
Uncomment Phase Weaponry
2020-11-10 12:34:52 -05:00
resleeving
Fixing conflicts
2020-10-05 18:10:53 -07:00
rogueminer_vr
…
scripting
…
security levels
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
shieldgen
…
shuttles
Fixing conflicts
2020-10-05 18:10:53 -07:00
spells
…
surgery
bugfixing my own shit
2020-11-04 20:26:48 -08: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
Update communications.dm
2020-10-22 11:17:39 -07:00
tooltip
…
turbolift
Finally setting up the PR bot
2020-10-14 21:14:38 -07:00
vchat
Fixing conflict and allowing export chatlog
2020-10-21 13:28:59 -07: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
Change OOC Escape message
2020-11-13 02:59:24 -07:00
xenoarcheaology
Merge pull request #9247 from VOREStation/upstream-merge-7734
2020-10-20 03:18:25 +00:00
xenobio
…
xenobio2
…
xgm
…