cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-21 14:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
cb879c31aa9f8fc7828f7abf9925458c769e4a17
CHOMPStation2/code/modules
History
Raeschen cb879c31aa Revert "Fix conflict with master" 
This reverts commit 42eba2a9dc.
2021-08-17 08:12:43 +02:00
..
admin
Merge pull request #2803 from CHOMPStation2/Razgriz1032-patch-6
2021-08-15 23:50:11 -04:00
ai
Fancy exploration shuttle
2021-08-08 18:48:28 +00:00
alarm
…
artifice
Fixes a bunch of bools missed in #11100
2021-07-16 21:12:20 +00:00
assembly
Optimize a couple things
2021-07-20 21:30:20 +00:00
asset_cache
Optimize a couple things
2021-07-20 21:30:20 +00:00
awaymissions
Merge branch 'master' into upstream-merge-11179
2021-07-20 20:59:10 -04:00
blob
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
blob2
Optimize a couple things
2021-07-20 21:30:20 +00:00
busy_space
Optimize a couple things
2021-07-20 21:30:20 +00:00
busy_space_vr
Optimize a couple things
2021-07-20 21:30:20 +00:00
busy_space_yw
…
catalogue
Optimize a couple things
2021-07-20 21:30:20 +00:00
client
Merge pull request #11376 from Hatterhat/nondep-jackets
2021-08-09 04:59:38 +00:00
clothing
Change Commonwealth References added by #2553 to Solgov
2021-08-15 15:34:30 -07:00
compass
…
customitems
Ports new Bay SolGov suits as Commonwealth suits
2021-07-15 19:29:34 -04:00
detectivework
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
DMAPI
…
economy
Janitor Equipment Fix
2021-08-01 14:45:35 +00:00
emotes
Revert "Merge branch 'master' into prbt"
2021-08-17 07:54:00 +02:00
entopics_vr
Optimize a couple things
2021-07-20 21:30:20 +00:00
error_handler
…
events
Optimize a couple things
2021-07-20 21:30:20 +00:00
examine
…
ext_scripts
…
fishing
…
flufftext
[MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 15:41:46 +00:00
food
Virology Revamp
2021-08-13 15:38:46 +00:00
gamemaster
Optimize a couple things
2021-07-20 21:30:20 +00:00
games
Converts visible_message notice spans to look more like emotes
2021-07-05 20:30:12 +00:00
genetics
Optimize a couple things
2021-07-20 21:30:20 +00:00
ghosttrap
Converts visible_message notice spans to look more like emotes
2021-07-05 20:30:12 +00:00
holodeck
Merge pull request #11299 from GhostActual/janitor
2021-07-29 20:10:26 +00:00
holomap
Remove atom/Uncross override
2021-07-28 20:43:23 +00:00
hydroponics
Optimize a couple things
2021-07-20 21:30:20 +00:00
icon generation
…
identification
Optimize a couple things
2021-07-20 21:30:20 +00:00
instruments
Optimize a couple things
2021-07-20 21:30:20 +00:00
integrated_electronics
Merge pull request #11188 from VOREStation/Arokha/colorhelpers
2021-07-20 23:02:01 +00:00
interserver shipping
…
keybindings
SSInput and Diagonal Movement
2021-07-07 18:35:44 +00:00
library
Merge pull request #11159 from VOREStation/Fixes/11156
2021-07-20 00:54:19 +00:00
lighting
Merge branch 'master' into upstream-merge-11324
2021-08-01 17:49:14 -04:00
looking_glass
Optimize a couple things
2021-07-20 21:30:20 +00:00
lore_codex
…
makeup
Merge pull request #10847 from MarinaGryphon/nailpolish
2021-07-05 23:56:25 +00:00
maps
Optimize a couple things
2021-07-20 21:30:20 +00:00
materials
Port Bay and Eris walls
2021-07-22 20:29:32 +00:00
media
Optimize a couple things
2021-07-20 21:30:20 +00:00
metric
[MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 15:41:46 +00:00
mining
[MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 15:41:46 +00:00
mob
Revert "Fix conflict with master"
2021-08-17 08:12:43 +02:00
modular_computers
Merge pull request #11342 from VOREStation/Arokha/connectedfancycomps
2021-08-06 21:47:09 +00:00
multi-tile
…
multiz
Merge pull request #2694 from CHOMPStationBot/upstream-merge-11307
2021-07-31 18:21:18 -07:00
nano
…
news
…
nifsoft
Reduces the sound volume of the NIF as to not blow your ears out
2021-08-08 09:11:03 +02:00
organs
Optimize a couple things
2021-07-20 21:30:20 +00:00
overmap
Merge branch 'master' into upstream-merge-11375
2021-08-09 19:11:26 -04:00
paperwork
Merge pull request #11255 from Verkister/patch-75
2021-07-26 13:32:57 +00:00
pda
Optimize a couple things
2021-07-20 21:30:20 +00:00
persistence
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Phorochemistry
…
planet
Merge branch 'master' into upstream-merge-11324
2021-08-01 17:49:14 -04:00
power
Merge pull request #11328 from VOREStation/Icons/fieldgen
2021-08-05 20:31:02 +00:00
projectiles
fix open bolt guns
2021-08-15 02:55:41 -07:00
radiation
…
random_map
Merge branch 'master' into upstream-merge-11179
2021-07-20 20:59:10 -04:00
reagents
powder that makes you say yes
2021-08-13 23:16:33 -04:00
recycling
Merge pull request #11372 from VOREStation/Fixes/11369
2021-08-09 03:41:19 +00:00
research
Fix Dupe Research Design
2021-08-15 15:15:24 -07:00
resleeving
Optimize a couple things
2021-07-20 21:30:20 +00:00
rogueminer_vr
Optimize a couple things
2021-07-20 21:30:20 +00:00
scripting
Merge pull request #11262 from VOREStation/Arokha/what
2021-07-27 01:11:50 +00:00
security levels
Optimize a couple things
2021-07-20 21:30:20 +00:00
shieldgen
Merge branch 'master' into upstream-merge-11110
2021-07-16 19:09:43 -04:00
shuttles
Fancy sprited shuttles
2021-08-06 22:15:49 +00:00
spells
Merge branch 'master' into upstream-merge-11110
2021-07-16 19:09:43 -04:00
surgery
powder that makes you say yes
2021-07-20 19:32:58 -04:00
tables
Merge pull request #11335 from VOREStation/Icons/srrack
2021-08-05 20:42:25 +00:00
telesci
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
tension
…
tgs
Optimize a couple things
2021-07-20 21:30:20 +00:00
tgui
Optimize a couple things
2021-07-20 21:30:20 +00:00
tooltip
…
turbolift
Merge pull request #11303 from VOREStation/Arokha/nozshadow
2021-07-30 14:55:41 +00:00
vchat
Add discord button to top
2021-07-03 21:20:55 +00:00
vehicles
Merge branch 'master' into upstream-merge-11110
2021-07-16 19:09:43 -04:00
ventcrawl
Merge pull request #11350 from VOREStation/Fixes/11061
2021-08-06 15:00:09 +00:00
virus2
Virology Revamp
2021-08-13 15:38:46 +00:00
vore
Fixes another vorgan duping condition
2021-08-15 19:48:49 +03:00
webhooks
…
xenoarcheaology
Optimize a couple things
2021-07-20 21:30:20 +00:00
xenobio
space
2021-07-24 01:32:13 -07:00
xenobio2
Optimize a couple things
2021-07-20 21:30:20 +00:00
xgm
Merge pull request #11273 from VOREStation/Arokha/gasvisuals
2021-07-27 15:40:45 +00:00