cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 23:46:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve polaris merge conflicts

Browse Source
This commit is contained in:
Eearslya
2016-08-06 21:39:24 -07:00
parent 85c3e22873
commit 42618dcef1
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/autolathe_datums_vr.dm
+4 -8
View File
@@ -1,20 +1,16 @@
/datum/autolathe/recipe/classic_smg_9mm
/datum/category_item/autolathe/arms/classic_smg_9mm
name = "SMG magazine (9mm)"
path = /obj/item/ammo_magazine/mc9mml
category = "Arms and Ammunition"
hidden = 1
/datum/autolathe/recipe/classic_smg_9mmr
/datum/category_item/autolathe/arms/classic_smg_9mmr
name = "SMG magazine (9mm rubber)"
path = /obj/item/ammo_magazine/mc9mml/rubber
category = "Arms and Ammunition"
/datum/autolathe/recipe/classic_smg_9mmp
/datum/category_item/autolathe/arms/classic_smg_9mmp
name = "SMG magazine (9mm practice)"
path = /obj/item/ammo_magazine/mc9mml/practice
category = "Arms and Ammunition"
/datum/autolathe/recipe/classic_smg_9mmf
/datum/category_item/autolathe/arms/classic_smg_9mmf
name = "SMG magazine (9mm flash)"
path = /obj/item/ammo_magazine/mc9mml/flash
category = "Arms and Ammunition"
code/modules/client/preference_setup/vore/01_ears.dm
+1
View File
@@ -12,6 +12,7 @@
var/r_tail = 30 // Tail/Taur color
var/g_tail = 30 // Tail/Taur color
var/b_tail = 30 // Tail/Taur color
var/dress_mob = TRUE
// Definition of the stuff for Ears
/datum/category_item/player_setup_item/vore/ears
vorestation.dme
-1
View File
@@ -524,7 +524,6 @@
#include "code\game\machinery\alarm.dm"
#include "code\game\machinery\atmo_control.dm"
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\autolathe_datums.dm"
#include "code\game\machinery\autolathe_datums_vr.dm"
#include "code\game\machinery\Beacon.dm"
#include "code\game\machinery\biogenerator.dm"