mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13.git
synced 2026-08-25 07:07:08 +01:00
Conflict fixes
This commit is contained in:
@@ -54,7 +54,6 @@
|
||||
to_chat(user, "<span class='warning'>[src] is empty!</span>")
|
||||
add_fingerprint(user)
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/fermichem/pHpaper
|
||||
name = "pH indicator strip"
|
||||
|
||||
Reference in New Issue
Block a user