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

Merge pull request #5704 from CHOMPStation2/upstream-merge-14476

Browse Source 
[MIRROR] Runtime fixes
This commit is contained in:
Razgriz
2023-02-12 19:01:40 -07:00
committed by GitHub
parent ec57252f19 6a4584c4c6
commit cd05f4c7e4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preference_setup/vore/08_nif.dm
View File

@@ -35,7 +35,7 @@
/datum/category_item/player_setup_item/vore/nif/copy_to_mob(var/mob/living/carbon/human/character)
//If you had a NIF...
if((character.type == /mob/living/carbon/human) && ispath(pref.nif_path) && pref.nif_durability)
if((character.type == /mob/living/carbon/human && !(character.mind.assigned_role == "Cyborg" || character.mind.assigned_role == "AI")) && ispath(pref.nif_path) && pref.nif_durability)
new pref.nif_path(character,pref.nif_durability,pref.nif_savedata)
/*

2
code/modules/paperwork/pen.dm
View File

@@ -27,6 +27,7 @@
throw_speed = 7
throw_range = 15
matter = list(MAT_STEEL = 10)
attack_verb = list("stabbed")
var/colour = "black" //what colour the ink is!
pressure_resistance = 2
drop_sound = 'sound/items/drop/accessory.ogg'
@@ -225,6 +226,7 @@
w_class = initial(w_class)
damtype = BRUTE
catchable = TRUE
attack_verb = initial(attack_verb)
/obj/item/weapon/pen/blade/blue
desc = "It's a normal blue ink pen."