cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update codex.dm

Browse Source
This commit is contained in:
Novacat
2020-03-15 14:45:18 -04:00
committed by GitHub
parent 8e2e4c6a4a
commit 4c7db1fc2d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/lore_codex/codex.dm
View File

@@ -40,12 +40,9 @@
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
root_type = /datum/lore/codex/category/main_news root_type = /datum/lore/codex/category/main_news
libcategory = "Reference" libcategory = "Reference"
<<<<<<< HEAD drop_sound = 'sound/items/drop/device.ogg'
/* //VORESTATION REMOVAL /* //VORESTATION REMOVAL
=======
drop_sound = 'sound/items/drop/device.ogg'
>>>>>>> 22e28f2... Merge pull request #6804 from Cerebulon/bigsounds
// Combines SOP/Regs/Law // Combines SOP/Regs/Law
/obj/item/weapon/book/codex/corp_regs /obj/item/weapon/book/codex/corp_regs
name = "NanoTrasen Regulatory Compendium" name = "NanoTrasen Regulatory Compendium"