cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-14 20:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc runtime fixes

Browse Source
This commit is contained in:
Cerebulon
2021-09-06 19:40:48 +01:00
parent 48337a1d46
commit 41b51e55f7
5 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/random/guns_and_ammo.dm
View File

@@ -170,7 +170,7 @@
icon_state = "grenade_2"
/obj/random/grenade/item_to_spawn()
return pick( prob(15);/obj/item/weapon/grenade/concussion,
return pick(prob(15);/obj/item/weapon/grenade/concussion,
prob(5);/obj/item/weapon/grenade/empgrenade,
prob(15);/obj/item/weapon/grenade/empgrenade/low_yield,
prob(5);/obj/item/weapon/grenade/chem_grenade/metalfoam,
@@ -194,7 +194,7 @@
icon_state = "grenade_3"
/obj/random/grenade/lethal/item_to_spawn()
return pick( prob(15);/obj/item/weapon/grenade/concussion,
return pick(prob(15);/obj/item/weapon/grenade/concussion,
prob(5);/obj/item/weapon/grenade/empgrenade,
prob(2);/obj/item/weapon/grenade/chem_grenade/incendiary,
prob(5);/obj/item/weapon/grenade/explosive,
@@ -208,7 +208,7 @@
icon_state = "grenade"
/obj/random/grenade/less_lethal/item_to_spawn()
return pick( prob(20);/obj/item/weapon/grenade/concussion,
return pick(prob(20);/obj/item/weapon/grenade/concussion,
prob(15);/obj/item/weapon/grenade/empgrenade/low_yield,
prob(15);/obj/item/weapon/grenade/chem_grenade/metalfoam,
prob(20);/obj/item/weapon/grenade/chem_grenade/teargas,
@@ -224,7 +224,7 @@
icon_state = "grenade_box"
/obj/random/grenade/box/item_to_spawn()
return pick( prob(20);/obj/item/weapon/storage/box/flashbangs,
return pick(prob(20);/obj/item/weapon/storage/box/flashbangs,
prob(10);/obj/item/weapon/storage/box/emps,
prob(20);/obj/item/weapon/storage/box/empslite,
prob(15);/obj/item/weapon/storage/box/smokes,

10
code/modules/food/food/snacks.dm
View File

@@ -6521,7 +6521,7 @@
desc = "Space squid tentacles, Carefully removed (from the squid) then dried into strips of delicious rubbery goodness!"
trash = /obj/item/trash/squid
filling_color = "#c0a9d7"
center_of_mass = "x=15;y=9"
center_of_mass = list ("x"=15, "y"=9)
nutriment_desc = list("fish" = 1, "salt" = 1)
nutriment_amt = 2
bitesize = 1
@@ -6537,7 +6537,7 @@
desc = "Fried bread cubes. Popular in Terran territories."
trash = /obj/item/trash/croutons
filling_color = "#c6b17f"
center_of_mass = "x=15;y=9"
center_of_mass = list ("x"=15, "y"=9)
nutriment_desc = list("bread" = 1, "salt" = 1)
nutriment_amt = 3
bitesize = 1
@@ -6549,7 +6549,7 @@
desc = "Pig fat. Salted. Just as good as it sounds."
trash = /obj/item/trash/salo
filling_color = "#e0bcbc"
center_of_mass = "x=15;y=9"
center_of_mass = list ("x"=15, "y"=9)
nutriment_desc = list("fat" = 1, "salt" = 1)
nutriment_amt = 2
bitesize = 2
@@ -6565,7 +6565,7 @@
desc = "Dried salted beer snack fish."
trash = /obj/item/trash/driedfish
filling_color = "#c8a5bb"
center_of_mass = "x=15;y=9"
center_of_mass = list ("x"=15, "y"=9)
nutriment_desc = list("fish" = 1, "salt" = 1)
nutriment_amt = 2
bitesize = 1
@@ -6872,7 +6872,7 @@
/obj/item/weapon/reagent_containers/food/snacks/old
name = "master old-food"
desc = "they're all inedible and potentially dangerous items"
center_of_mass = "x=15;y=12"
center_of_mass = list ("x"=15, "y"=9)
nutriment_desc = list("rot" = 5, "mold" = 5)
nutriment_amt = 10
bitesize = 3

1
code/modules/mob/living/living.dm
View File

@@ -1029,6 +1029,7 @@
do_give(H)
return TRUE
make_item_drop_sound(I)
drop_from_inventory(item)
I.forceMove(get_turf(target))
return TRUE

3
code/modules/xenoarcheaology/effects/vampire.dm
View File

@@ -30,7 +30,8 @@
DoEffectAura()
/datum/artifact_effect/vampire/DoEffectAura()
nearby_mobs.Cut()
if (nearby_mobs.len)
nearby_mobs.Cut()
var/turf/T = get_turf(holder)