Skip to content

Commit

Permalink
у рд в шкафу его халат/ новый спрайт его хардсьюта / малориан (BlueMo…
Browse files Browse the repository at this point in the history
…on-Labs#483)

* sprites32

* sprites322
  • Loading branch information
Ouch authored Oct 16, 2023
1 parent 4ea7061 commit 1a5da5f
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
new /obj/item/clothing/head/beret/rd(src)
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
new /obj/item/clothing/suit/toggle/labcoat/rd(src)
new /obj/item/clothing/under/rank/rnd/research_director(src)
new /obj/item/clothing/under/rank/rnd/research_director/skirt(src)
new /obj/item/clothing/under/rank/rnd/research_director/alt(src)
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1398,6 +1398,7 @@
icon_state = "hawaiiblack"
item_state = "hawaiiblack"
togglename = "buttons"
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

/obj/item/clothing/suit/toggle/jacket/hawaiian/fuch
name = "fuch hawaiian shirt"
Expand Down
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/head_muzzled.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit_digi.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
7 changes: 7 additions & 0 deletions modular_bluemoon/fluffs/code/donator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,13 @@
ckeywhitelist = list("vulpshiro", "dolbajob", "ordinarylife", "z67")
subcategory = LOADOUT_SUBCATEGORIES_DON17

/datum/gear/donator/bm/malorian
name = "Araki Malorian Kit"
slot = ITEM_SLOT_BACKPACK
path = /obj/item/malorian_kit
ckeywhitelist = list("vulpshiro", "dolbajob", "ordinarylife", "z67")
subcategory = LOADOUT_SUBCATEGORIES_DON17

/datum/gear/donator/bm/stunblade
name = "Stunblade Kit"
slot = ITEM_SLOT_BACKPACK
Expand Down
31 changes: 31 additions & 0 deletions modular_bluemoon/fluffs/code/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,37 @@
can_suppress = FALSE
fire_sound = 'modular_bluemoon/fluffs/sound/weapon/nue_shoot.ogg'

//////////////////////////////////////////////////////////////////////////////////////////////////////////////

/obj/item/malorian_kit
name = "Araki Malorian Kit"
desc = "A modkit for making an Enforcer into a Araki Malorian."
icon = 'modular_splurt/icons/obj/clothing/reinforcekits.dmi'
w_class = WEIGHT_CLASS_SMALL
icon_state = "sec_armor_kit"
var/product = /obj/item/gun/ballistic/automatic/pistol/enforcer/malorian //what it makes
var/list/fromitem = list(/obj/item/gun/ballistic/automatic/pistol/enforcer/nomag, /obj/item/gun/ballistic/automatic/pistol/enforcer, /obj/item/gun/ballistic/automatic/pistol/enforcerred, /obj/item/gun/ballistic/automatic/pistol/enforcergold) //what it needs

/obj/item/malorian_kit/afterattack(obj/O, mob/user as mob)
if(istype(O, product))
to_chat(user,"<span class='warning'>[O] is already modified!")
return
if(O.type in fromitem) //makes sure O is the right thing
new product(usr.loc) //spawns the product
user.visible_message("<span class='warning'>[user] modifies [O]!","<span class='warning'>You modify the [O]!")
qdel(O) //Gets rid of the baton
qdel(src) //gets rid of the kit



/obj/item/gun/ballistic/automatic/pistol/enforcer/malorian
name = "\improper Araki Malorian"
desc = "A big fucking gun."
icon = 'modular_bluemoon/fluffs/icons/obj/64x64.dmi'
icon_state = "arakiarms"
can_suppress = FALSE
fire_sound = 'modular_bluemoon/fluffs/sound/weapon/nue_shoot.ogg'


//////////////////// AM4 уже есть в лодауте донатеров. Это лишь его рескин.

Expand Down
Binary file added modular_bluemoon/fluffs/icons/obj/64x64.dmi
Binary file not shown.

0 comments on commit 1a5da5f

Please sign in to comment.