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
1efc4bcd9f3ca876ca2f9ff4fa291aa4ddf3674e
CHOMPStation2/code/modules
History
Novacat 1efc4bcd9f Merge pull request #9304 from Novacat/nova-basicfixes 
Balance fixes and bugfixes
2020-11-14 17:54:59 +00:00
..
admin
Admin teleport verb addition
2020-10-28 02:28:19 -07: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
Merge pull request #749 from cadyn/linguist
2020-10-26 00:01:38 -04: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 #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
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
Nerfs space vine pitcher plants
2020-10-25 23:43:20 -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
Merge pull request #771 from CHOMPStationBot/upstream-merge-9260
2020-10-28 21:14:21 -07:00
mob
Merge pull request #9304 from Novacat/nova-basicfixes
2020-11-14 17:54:59 +00: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 #772 from CHOMPStationBot/upstream-merge-9086
2020-10-28 21:37:49 -07:00
organs
Merge pull request #749 from cadyn/linguist
2020-10-26 00:01:38 -04: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 #759 from CHOMPStationBot/upstream-merge-9207
2020-10-28 20:21:26 -07: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
Allow more types of Prosthetic to be made and torsos are no longer black.
2020-10-22 12:56:31 -04: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
Adding dehusk and tox/oxyloss surgery
2020-10-21 23:32:27 -07: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
Update living_vr.dm
2020-10-28 18:36:19 -07:00
xenoarcheaology
Merge pull request #9247 from VOREStation/upstream-merge-7734
2020-10-20 03:18:25 +00:00
xenobio
…
xenobio2
…
xgm
…