Skip to content

Commit

Permalink
Merge pull request Civ13#2579 from savethetreez/master
Browse files Browse the repository at this point in the history
Misc small stuff
  • Loading branch information
savethetreez authored Jan 19, 2024
2 parents a171bd6 + 966f945 commit 44087bd
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 22 deletions.
41 changes: 23 additions & 18 deletions code/game/objects/map_metadata/drug_bust.dm
Original file line number Diff line number Diff line change
Expand Up @@ -202,24 +202,26 @@ obj/map_metadata/drug_bust/job_enabled_specialcheck(var/datum/job/J)
desc = "A block of very pure cocaine. Contains [vol] grams."

/obj/item/weapon/reagent_containers/cocaineblock/attackby(var/obj/item/I, var/mob/user)
if (istype(I, /obj/item/weapon/material/kitchen/utensil/knife))
if (reagents.get_reagent_amount("cocaine") >= 10)
user << "You cut a line from the [src]."
reagents.remove_reagent("cocaine",5)
var/obj/item/weapon/reagent_containers/pill/cocaine_line/coca = new/obj/item/weapon/reagent_containers/pill/cocaine_line(user)
user.put_in_hands(coca)
vol = reagents.get_reagent_amount("cocaine")/25
desc = "A block of very pure cocaine. Contains [vol] grams."
if (reagents.get_reagent_amount("cocaine") >= 500)
name = "block of cocaine"
desc = "A block of very pure cocaine."
icon_state = "single_brick"
else
name = "torn block of cocaine"
desc = "A block of very pure cocaine that's been cut or torn from the outside."
icon_state = "single_brick_torn"
else
if (!istype(I, /obj/item/weapon/material/kitchen/utensil/knife))
user << "You need a knife to cut the [src]."
return
if (reagents.get_reagent_amount("cocaine") < 10)
qdel(src)
return
user << "You cut a line from the [src]."
reagents.remove_reagent("cocaine",5)
var/obj/item/weapon/reagent_containers/pill/cocaine_line/coca = new/obj/item/weapon/reagent_containers/pill/cocaine_line(user)
user.put_in_hands(coca)
vol = reagents.get_reagent_amount("cocaine")/25
desc = "A block of very pure cocaine. Contains [vol] grams."
if (reagents.get_reagent_amount("cocaine") >= 500)
name = "block of cocaine"
desc = "A block of very pure cocaine."
icon_state = "single_brick"
else
name = "torn block of cocaine"
desc = "A block of very pure cocaine that's been cut or torn from the outside."
icon_state = "single_brick_torn"

/obj/item/weapon/reagent_containers/cocaineblock/attackby(var/obj/item/I, var/mob/user)
if (istype(I, /obj/item/weapon/reagent_containers/pill/cocaine_line))
Expand Down Expand Up @@ -294,5 +296,8 @@ obj/map_metadata/drug_bust/job_enabled_specialcheck(var/datum/job/J)
user << "You split a from the [src] apart."
var/obj/item/weapon/reagent_containers/cocaineblock/block = new/obj/item/weapon/reagent_containers/cocaineblock(user)
user.put_in_hands(block)
qdel(src)
else
..()
..()

//TO-DO: Recode cocaine blocks to stackable properly
4 changes: 1 addition & 3 deletions code/modules/1713/jobs/russian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3357,10 +3357,8 @@
else
H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/sov_ushanka/down(H), slot_head)
//coat
if (prob(45))
if (prob(50))
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/coat/ww2/sovcoat(H), slot_wear_suit)
else if (prob(50))
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/coat/ww2/sovcoat2(H), slot_wear_suit)
else
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/coat/ww2/soviet(H), slot_wear_suit)
//grenade
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@
/obj/structure/emergency_lights/proc/check_sound()
if (world.realtime >= lastsoundcheck)
if (on)
if (map.ID != MAP_DRUG_BUST || map.ID != MAP_BANK_ROBBERY)
if (map.ID != MAP_DRUG_BUST && map.ID != MAP_BANK_ROBBERY)
playsound(loc,'sound/machines/police_siren.ogg',100,FALSE,15)
lastsoundcheck = world.realtime+55
spawn(55)
Expand Down
Binary file modified icons/mob/head.dmi
Binary file not shown.

0 comments on commit 44087bd

Please sign in to comment.