cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
8157b3a7ab1d0b57345861fad60185453b225d93
CHOMPStation2/code/modules
History
VirgoBot 8157b3a7ab [MIRROR] Skips traits that aren't implemented yet. (ABLE TO BE MERGED) (#13165) 
* Merge pull request #8655 from MistakeNot4892/traitfix

Skips traits that aren't implemented yet.

* Skips traits that aren't implemented yet.

Co-authored-by: Atermonera <atermonera@gmail.com>
2022-09-23 01:03:44 +00:00
..
admin
Merge pull request #4938 from CHOMPStation2/upstream-merge-13738
2022-09-18 21:14:10 -04:00
ai
Merge pull request #13680 from Heroman3003/slimefix1
2022-09-10 20:35:48 +00:00
alarm
…
artifice
…
assembly
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
asset_cache
…
awaymissions
…
blob
…
blob2
Condenses all the animal languages and deletes unused/unwanted languages
2022-08-14 05:44:51 +00:00
busy_space
…
busy_space_vr
…
busy_space_yw
…
casino
More casino updates
2022-08-21 19:38:41 +00:00
catalogue
[READY] Adds Altevian species
2022-08-12 18:05:36 +00:00
client
[MIRROR] Skips traits that aren't implemented yet. (ABLE TO BE MERGED) (#13165)
2022-09-23 01:03:44 +00:00
clothing
Adds more altevian content
2022-09-18 09:39:22 +00:00
compass
…
customitems
…
detectivework
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
DMAPI
…
economy
Adds more altevian content
2022-09-18 09:39:22 +00:00
emotes
forgot some comments
2022-07-21 13:17:41 +12:00
entopics_vr
…
error_handler
…
events
Merge pull request #13742 from Heroman3003/moreruntimes
2022-09-18 09:35:35 +00:00
examine
…
ext_scripts
…
fishing
…
flufftext
…
food
Merge pull request #4960 from CHOMPStation2/upstream-merge-13750
2022-09-18 21:13:27 -04:00
gamemaster
…
games
Merge pull request #13718 from Runa-Dacino/card-numbering
2022-09-11 19:38:04 +00:00
genetics
…
ghosttrap
…
holodeck
Merge pull request #13326 from VOREStation/upstream-merge-8662
2022-07-15 22:32:16 +00:00
holomap
…
hydroponics
Starts vine processing from tray on creation
2022-08-18 22:00:19 -04:00
icon generation
…
identification
…
instruments
Fixes a bunch runtimes
2022-09-04 21:47:57 +00:00
integrated_electronics
Merge pull request #13439 from Heroman3003/ic-runtime-fix
2022-08-07 19:35:49 +00:00
interserver shipping
…
keybindings
…
library
Merge pull request #13656 from Heroman3003/bookfix
2022-09-04 21:49:08 +00:00
lighting
…
looking_glass
…
lore_codex
…
makeup
…
maps
…
materials
Merge pull request #13349 from Heroman3003/frame-parts
2022-07-17 09:32:41 +00:00
media
Merge pull request #13455 from TankTheBirb/Belt-Podzu
2022-08-07 19:47:51 +00:00
mentor
Merge branch 'master' into upstream-merge-13554
2022-08-28 19:14:47 -04:00
metric
…
mining
Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs
2022-07-29 20:48:29 +00:00
mob
Merge pull request #4957 from CHOMPStation2/upstream-merge-13753
2022-09-18 21:12:42 -04:00
modular_computers
…
multi-tile
…
multiz
Merge pull request #4845 from CHOMPStation2/upstream-merge-13660
2022-09-04 18:40:29 -04:00
nano
…
news
…
nifsoft
Merge pull request #13568 from FirstSgtDan/nifsoft
2022-08-25 22:58:53 +00:00
organs
Merge pull request #4901 from CHOMPStation2/upstream-merge-13698
2022-09-18 20:21:38 -04:00
overmap
…
paperwork
Clown stamp is now usable by alt title entertainers FIXES #4965
2022-09-20 18:47:08 -05:00
pda
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
persistence
…
Phorochemistry
…
planet
Merge pull request #4829 from CHOMPStation2/upstream-merge-13634
2022-09-04 17:06:11 -04:00
power
Merge pull request #13681 from Heroman3003/few-things-aaa
2022-09-10 20:35:43 +00:00
projectiles
Removes last references to simple_animal
2022-09-10 20:54:36 +00:00
radiation
…
random_map
Nerfs mining yields for SD and RP
2022-08-14 05:44:47 +00:00
reagents
powder that makes you say yes
2022-09-04 18:09:38 -04:00
recycling
just powder
2022-08-28 20:08:45 -05:00
research
Adds the other drone assemblies to the protolathe FIXES #3893
2022-09-20 21:05:49 -05:00
resleeving
powder that makes you say yes
2022-08-28 18:59:23 -04:00
rogueminer_vr
Merge pull request #13669 from Heroman3003/runtimes2
2022-09-06 19:42:35 +00:00
scripting
…
security levels
…
shieldgen
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
shuttles
…
spells
…
stockmarket
…
surgery
Merge pull request #13457 from TankTheBirb/borgeon
2022-08-07 19:53:05 +00:00
tables
…
telesci
…
tension
…
tgs
Adjust TGS stats's AFK
2022-08-23 12:13:16 -07:00
tgui
Removes last references to simple_animal
2022-09-10 20:54:36 +00:00
tgui_input
Merge pull request #13289 from Heroman3003/tgui-jobstart-fixes
2022-07-08 00:31:18 +00:00
tools
…
tooltip
…
turbolift
…
vchat
Merge pull request #13637 from ItsSelis/vchat-qol1
2022-09-18 09:31:57 +00:00
vehicles
Add in chompstation comments.
2022-09-18 22:55:53 -05:00
ventcrawl
Merge pull request #13301 from Heroman3003/vmice-crawl
2022-07-08 05:58:47 +00:00
virus2
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
vore
Merge pull request #4957 from CHOMPStation2/upstream-merge-13753
2022-09-18 21:12:42 -04:00
webhooks
…
xenoarcheaology
Updates sprite location for new Suspension Field Generator FIXES #4971
2022-09-21 16:12:48 -05:00
xenobio
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
xenobio2
powder that makes you say yes
2022-09-10 22:05:55 -04:00
xgm
…