Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817

[MIRROR] [READY]Pulling claw 2
This commit is contained in:
LetterJay
2018-01-11 15:19:11 -06:00
committed by GitHub
10 changed files with 162 additions and 57 deletions

View File

@@ -28,6 +28,8 @@
var/list/unique_reskin //List of options to reskin.
var/dangerous_possession = FALSE //Admin possession yes/no
/obj/vv_edit_var(vname, vval)
switch(vname)
if("dangerous_possession")
@@ -63,6 +65,7 @@
visible_message("<span class='danger'>[src] shatters into a million pieces!</span>")
qdel(src)
/obj/assume_air(datum/gas_mixture/giver)
if(loc)
return loc.assume_air(giver)