mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-17 13:02:49 +00:00
c4bd191222
Conflicts: baystation12.dme code/controllers/master_controller.dm code/defines/obj.dm code/game/gamemodes/events.dm code/game/machinery/newscaster.dm code/game/objects/items/blueprints.dm code/game/objects/items/stacks/sheets/sheet_types.dm code/game/objects/items/stacks/stack.dm code/game/objects/structures/stool_bed_chair_nest/bed.dm code/game/turfs/turf.dm code/modules/awaymissions/zlevel.dm code/modules/maps/fromdmp.dm code/modules/mob/living/silicon/ai/freelook/eye.dm code/modules/mob/living/silicon/ai/freelook/update_triggers.dm code/modules/mob/living/silicon/silicon.dm code/modules/mob/living/simple_animal/life.dm code/modules/mob/mob_movement.dm code/setup.dm icons/mob/uniform.dmi icons/obj/closet.dmi icons/obj/clothing/uniforms.dmi maps/RandomZLevels/assistantChamber.dmm maps/RandomZLevels/fileList.txt maps/tgstation.2.0.9.dmm Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
211 lines
6.5 KiB
Plaintext
211 lines
6.5 KiB
Plaintext
/obj/item/weapon/storage/lglo_kit/New()
|
|
|
|
new /obj/item/clothing/gloves/latex(src)
|
|
new /obj/item/clothing/gloves/latex(src)
|
|
new /obj/item/clothing/gloves/latex(src)
|
|
new /obj/item/clothing/gloves/latex(src)
|
|
new /obj/item/clothing/gloves/latex(src)
|
|
new /obj/item/clothing/gloves/latex(src)
|
|
new /obj/item/clothing/gloves/latex(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/blankbox/New()
|
|
|
|
new /obj/item/ammo_casing/shotgun/blank(src)
|
|
new /obj/item/ammo_casing/shotgun/blank(src)
|
|
new /obj/item/ammo_casing/shotgun/blank(src)
|
|
new /obj/item/ammo_casing/shotgun/blank(src)
|
|
new /obj/item/ammo_casing/shotgun/blank(src)
|
|
new /obj/item/ammo_casing/shotgun/blank(src)
|
|
new /obj/item/ammo_casing/shotgun/blank(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/flashbang_kit/New()
|
|
|
|
new /obj/item/weapon/grenade/flashbang(src)
|
|
new /obj/item/weapon/grenade/flashbang(src)
|
|
new /obj/item/weapon/grenade/flashbang(src)
|
|
new /obj/item/weapon/grenade/flashbang(src)
|
|
new /obj/item/weapon/grenade/flashbang(src)
|
|
new /obj/item/weapon/grenade/flashbang(src)
|
|
new /obj/item/weapon/grenade/flashbang(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/emp_kit/New()
|
|
|
|
new /obj/item/weapon/grenade/empgrenade(src)
|
|
new /obj/item/weapon/grenade/empgrenade(src)
|
|
new /obj/item/weapon/grenade/empgrenade(src)
|
|
new /obj/item/weapon/grenade/empgrenade(src)
|
|
new /obj/item/weapon/grenade/empgrenade(src)
|
|
new /obj/item/weapon/grenade/empgrenade(src)
|
|
new /obj/item/weapon/grenade/empgrenade(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/stma_kit/New()
|
|
|
|
new /obj/item/clothing/mask/surgical(src)
|
|
new /obj/item/clothing/mask/surgical(src)
|
|
new /obj/item/clothing/mask/surgical(src)
|
|
new /obj/item/clothing/mask/surgical(src)
|
|
new /obj/item/clothing/mask/surgical(src)
|
|
new /obj/item/clothing/mask/surgical(src)
|
|
new /obj/item/clothing/mask/surgical(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/gl_kit/New()
|
|
|
|
new /obj/item/clothing/glasses/regular(src)
|
|
new /obj/item/clothing/glasses/regular(src)
|
|
new /obj/item/clothing/glasses/regular(src)
|
|
new /obj/item/clothing/glasses/regular(src)
|
|
new /obj/item/clothing/glasses/sunglasses/prescription(src)
|
|
new /obj/item/clothing/glasses/sunglasses/prescription(src)
|
|
new /obj/item/clothing/glasses/meson/prescription(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/trackimp_kit/New()
|
|
|
|
new /obj/item/weapon/implantcase/tracking(src)
|
|
new /obj/item/weapon/implantcase/tracking(src)
|
|
new /obj/item/weapon/implantcase/tracking(src)
|
|
new /obj/item/weapon/implantcase/tracking(src)
|
|
new /obj/item/weapon/implanter(src)
|
|
new /obj/item/weapon/implantpad(src)
|
|
new /obj/item/weapon/locator(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/chemimp_kit/New()
|
|
|
|
new /obj/item/weapon/implantcase/chem(src)
|
|
new /obj/item/weapon/implantcase/chem(src)
|
|
new /obj/item/weapon/implantcase/chem(src)
|
|
new /obj/item/weapon/implantcase/chem(src)
|
|
new /obj/item/weapon/implantcase/chem(src)
|
|
new /obj/item/weapon/implanter(src)
|
|
new /obj/item/weapon/implantpad(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/injectbox/New()
|
|
|
|
new /obj/item/weapon/dnainjector/h2m(src)
|
|
new /obj/item/weapon/dnainjector/h2m(src)
|
|
new /obj/item/weapon/dnainjector/h2m(src)
|
|
new /obj/item/weapon/dnainjector/m2h(src)
|
|
new /obj/item/weapon/dnainjector/m2h(src)
|
|
new /obj/item/weapon/dnainjector/m2h(src)
|
|
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/fcard_kit/New()
|
|
|
|
new /obj/item/weapon/f_card(src)
|
|
new /obj/item/weapon/f_card(src)
|
|
new /obj/item/weapon/f_card(src)
|
|
new /obj/item/weapon/f_card(src)
|
|
new /obj/item/weapon/f_card(src)
|
|
new /obj/item/weapon/f_card(src)
|
|
new /obj/item/weapon/f_card(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/id_kit/New()
|
|
|
|
new /obj/item/weapon/card/id(src)
|
|
new /obj/item/weapon/card/id(src)
|
|
new /obj/item/weapon/card/id(src)
|
|
new /obj/item/weapon/card/id(src)
|
|
new /obj/item/weapon/card/id(src)
|
|
new /obj/item/weapon/card/id(src)
|
|
new /obj/item/weapon/card/id(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/handcuff_kit/New()
|
|
|
|
new /obj/item/weapon/handcuffs(src)
|
|
new /obj/item/weapon/handcuffs(src)
|
|
new /obj/item/weapon/handcuffs(src)
|
|
new /obj/item/weapon/handcuffs(src)
|
|
new /obj/item/weapon/handcuffs(src)
|
|
new /obj/item/weapon/handcuffs(src)
|
|
new /obj/item/weapon/handcuffs(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/seccart_kit/New()
|
|
new /obj/item/weapon/cartridge/security(src)
|
|
new /obj/item/weapon/cartridge/security(src)
|
|
new /obj/item/weapon/cartridge/security(src)
|
|
new /obj/item/weapon/cartridge/security(src)
|
|
new /obj/item/weapon/cartridge/security(src)
|
|
new /obj/item/weapon/cartridge/security(src)
|
|
new /obj/item/weapon/cartridge/security(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/donkpocket_kit/New()
|
|
|
|
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
|
|
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
|
|
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
|
|
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
|
|
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
|
|
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/condimentbottles/New()
|
|
|
|
new /obj/item/weapon/reagent_containers/food/condiment(src)
|
|
new /obj/item/weapon/reagent_containers/food/condiment(src)
|
|
new /obj/item/weapon/reagent_containers/food/condiment(src)
|
|
new /obj/item/weapon/reagent_containers/food/condiment(src)
|
|
new /obj/item/weapon/reagent_containers/food/condiment(src)
|
|
new /obj/item/weapon/reagent_containers/food/condiment(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/drinkingglasses/New()
|
|
|
|
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
|
|
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
|
|
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
|
|
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
|
|
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
|
|
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
|
|
..()
|
|
return
|
|
|
|
/*
|
|
/obj/item/weapon/storage/disk_kit/disks/New()
|
|
|
|
new /obj/item/weapon/card/data(src)
|
|
new /obj/item/weapon/card/data(src)
|
|
new /obj/item/weapon/card/data(src)
|
|
new /obj/item/weapon/card/data(src)
|
|
new /obj/item/weapon/card/data(src)
|
|
new /obj/item/weapon/card/data(src)
|
|
new /obj/item/weapon/card/data(src)
|
|
..()
|
|
return
|
|
|
|
/obj/item/weapon/storage/disk_kit/disks2/New()
|
|
|
|
spawn( 2 )
|
|
for(var/obj/item/weapon/card/data/D in src.loc)
|
|
D.loc = src
|
|
//Foreach goto(23)
|
|
return
|
|
..()
|
|
return
|
|
*/ |