cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-05 22:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
855f42ec48696f824faa4f64235cfd4e4fae73fa
CHOMPStation2/code/modules
T
History
cadyn 855f42ec48 Fix conflicts
2020-11-25 20:22:48 -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
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
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
2020-11-24 00:54:34 +00:00
clothing
fix stupid shit
2020-11-21 19:12:41 -08:00
customitems
Cached version of icon_states() proc
2020-05-06 16:06:44 -04:00
detectivework
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
DMAPI
Preparations for tgs 4 (does not actually change anything for current tgs version)
2020-07-04 23:37:42 +02:00
economy
Fixing conflicts
2020-10-05 18:10:53 -07:00
entopics_vr
…
error_handler
Update error_handler.dm
2020-07-18 20:28:41 -07:00
events
Metroid Event and tweaks
2020-11-22 01:00:16 -07:00
examine
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
ext_scripts
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
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 #9301 from Jwguy/FoodAdds
2020-11-19 01:29:03 +00: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
Building TGUI
2020-11-15 01:58:16 -08:00
icon generation
…
identification
…
integrated_electronics
Building TGUI
2020-11-15 01:58:16 -08:00
interserver shipping
…
library
Fixes #8592
2020-09-29 01:18:06 -04:00
lighting
Refactor move code
2020-04-26 16:42:50 -04:00
looking_glass
Fixing conflicts
2020-10-05 18:10:53 -07:00
lore_codex
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-17 09:44:00 +02:00
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
Fix conflicts
2020-11-25 20:22:48 -08:00
modular_computers
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
multi-tile
Allow fighters to traverse overmap ships predictably
2020-04-14 15:56:40 -04:00
multiz
Fixing conflicts
2020-10-05 18:10:53 -07:00
nano
Fix silly stuff
2020-10-05 19:46:50 -07:00
nifsoft
Building TGUI
2020-11-15 01:58:16 -08:00
organs
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
2020-11-24 00:54:34 +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
Merge pull request #9329 from Novacat/nova-basicfixes
2020-11-20 00:54:20 +00:00
persistence
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
Phorochemistry
…
planet
…
power
Building TGUI
2020-11-15 01:58:16 -08:00
projectiles
borkfixes
2020-11-21 08:09:11 -08:00
radiation
Merge pull request #9208 from VOREStation/upstream-merge-7696
2020-10-19 10:38:00 +00:00
random_map
Further fixes
2020-08-14 18:15:24 -04:00
reagents
Building TGUI
2020-11-15 01:58:16 -08:00
recycling
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
research
Building TGUI
2020-11-15 01:58:16 -08:00
resleeving
Fixing conflicts
2020-10-05 18:10:53 -07:00
rogueminer_vr
Building TGUI
2020-11-15 01:58:16 -08:00
scripting
Fixed merge conflicts and errors, everything seems to work
2020-04-23 18:25:25 -07:00
security levels
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
shieldgen
Merge pull request #7507 from listerla/shieldgen
2020-08-20 22:24:21 -04:00
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
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
2020-11-24 00:54:34 +00:00
xenoarcheaology
Merge pull request #9247 from VOREStation/upstream-merge-7734
2020-10-20 03:18:25 +00:00
xenobio
Remove xeno taser recoil
2020-11-17 04:02:45 -07:00
xenobio2
…
xgm
…