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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-15 20:38:46 -04:00
committed by GitHub
parent a7e5cce5b8
commit 3510ba7905
1 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/game/machinery/gear_dispenser.dm
View File

@@ -565,30 +565,6 @@ var/list/dispenser_presets = list()
one_setting = /datum/gear_disp/voidsuit/autolok one_setting = /datum/gear_disp/voidsuit/autolok
special_frame = "frame_grey" special_frame = "frame_grey"
<<<<<<< HEAD
||||||| parent of f17916abb4... Merge pull request #11095 from VOREStation/Arokha/tweakkkk
////////////////////////////// MOEBIUS SUIT DISPENSERS ///////////////////////////
/datum/gear_disp/voidsuit/aether
name = "Aether Voidsuit"
voidsuit_type = /obj/item/clothing/suit/space/void/aether
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/aether
refit = FALSE // No animal sprites AAA!
/obj/machinery/gear_dispenser/suit/aether
name = "\improper Aether Voidsuit Dispenser"
desc = "An industrial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
icon_state = "suitdispenserMB"
dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
one_setting = /datum/gear_disp/voidsuit/aether
/obj/machinery/gear_dispenser/suit_fancy/aether
name = "\improper Aether Voidsuit Dispenser"
desc = "A commercial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
one_setting = /datum/gear_disp/voidsuit/aether
special_frame = "frame_purple"
=======
////////////////////////////// MOEBIUS SUIT DISPENSERS /////////////////////////// ////////////////////////////// MOEBIUS SUIT DISPENSERS ///////////////////////////
/datum/gear_disp/voidsuit/aether /datum/gear_disp/voidsuit/aether
name = "Aether Voidsuit" name = "Aether Voidsuit"
@@ -609,7 +585,6 @@ var/list/dispenser_presets = list()
one_setting = /datum/gear_disp/voidsuit/aether one_setting = /datum/gear_disp/voidsuit/aether
special_frame = "frame_purple" special_frame = "frame_purple"
>>>>>>> f17916abb4... Merge pull request #11095 from VOREStation/Arokha/tweakkkk
// Adminbuse // Adminbuse
/obj/machinery/gear_dispenser/vv_get_dropdown() /obj/machinery/gear_dispenser/vv_get_dropdown()
. = ..() . = ..()
@@ -896,4 +871,4 @@ var/list/dispenser_presets = list()
/datum/gear_disp/adventure_box/armor, /datum/gear_disp/adventure_box/armor,
/datum/gear_disp/adventure_box/light, /datum/gear_disp/adventure_box/light,
/datum/gear_disp/adventure_box/weapon /datum/gear_disp/adventure_box/weapon
) )