cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs
This commit is contained in:
Repede
2018-04-27 21:45:13 -04:00
parent 66ad7e4bb7 e5f7b51468
commit 372e145108
243 changed files with 162638 additions and 120459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preference_setup/loadout/loadout_utility.dm
View File

@@ -46,6 +46,12 @@
path = /obj/item/weapon/book/codex/corp_regs
cost = 0
*/
/datum/gear/utility/robutt
display_name = "a buyer's guide to artificial bodies"
path = /obj/item/weapon/book/codex/lore/robutt
cost = 0
/datum/gear/utility/folder_blue
display_name = "folder, blue"
path = /obj/item/weapon/folder/blue