cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-14 19:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
53bbc74d653922d2d96a535a542202e53accdf73
CHOMPStation2/code/modules
History
Razgriz 53bbc74d65 Merge pull request #707 from CHOMPStationBot/upstream-merge-9213 
[MIRROR] Lets all heads set alert level, restores "Station Time" option to status displays
2020-10-23 19:55:59 -07: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
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
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
Why it was commented out
2020-10-21 13:37:59 -04:00
clothing
Merge pull request #706 from CHOMPStationBot/upstream-merge-9232
2020-10-19 18:12:16 -07:00
customitems
…
detectivework
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
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
Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
2020-08-29 03:04:34 -04:00
food
Merge pull request #721 from CHOMPStationBot/upstream-merge-9224
2020-10-22 10:09:11 -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
TGUI Civilian
2020-09-02 13:32:42 -07:00
holomap
…
hydroponics
Pitcher plants
2020-10-22 08:08:19 -04: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 #747 from Darlantanis/PitcherPlants
2020-10-23 19:52:13 -07: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
Merge pull request #9181 from Runa-Dacino/NIF-MassAlteration-Option-No
2020-10-19 10:40:30 +00: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
Merge pull request #725 from CHOMPStationBot/upstream-merge-9220
2020-10-22 10:04:24 -04:00
projectiles
Confetti cannon tweak
2020-10-22 08:08:44 -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 #747 from Darlantanis/PitcherPlants
2020-10-23 19:52:13 -07: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
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
Merge pull request #747 from Darlantanis/PitcherPlants
2020-10-23 19:52:13 -07:00
xenoarcheaology
Merge pull request #9247 from VOREStation/upstream-merge-7734
2020-10-20 03:18:25 +00:00
xenobio
…
xenobio2
…
xgm
…