mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
Build SpacemanDMM from source (#49712)
* Build SpacemanDMM from source * oops * Fix new unreachables/dumb code * ooops cache conflict * bugfix * oops * lint * ninjanomnom held me down and forced me to delete this
This commit is contained in:
@@ -518,7 +518,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
|
||||
toggle_on(user)
|
||||
|
||||
if(iscyborg(target))
|
||||
if(BATON_STUN)
|
||||
if(mode == BATON_STUN)
|
||||
..()
|
||||
return FALSE
|
||||
|
||||
|
||||
@@ -138,6 +138,7 @@
|
||||
|
||||
// Do not call except via load() above.
|
||||
/datum/parsed_map/proc/_load_impl(x_offset = 1, y_offset = 1, z_offset = world.maxz + 1, cropMap = FALSE, no_changeturf = FALSE, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper = INFINITY, placeOnTop = FALSE)
|
||||
PRIVATE_PROC(TRUE)
|
||||
var/list/areaCache = list()
|
||||
var/list/modelCache = build_cache(no_changeturf)
|
||||
var/space_key = modelCache[SPACE_KEY]
|
||||
|
||||
@@ -294,6 +294,7 @@
|
||||
/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE) //Force overrides TRAIT_NODROP for things like wizarditis and admin undress.
|
||||
//Use no_move if the item is just gonna be immediately moved afterward
|
||||
//Invdrop is used to prevent stuff in pockets dropping. only set to false if it's going to immediately be replaced
|
||||
PROTECTED_PROC(TRUE)
|
||||
if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for TRAIT_NODROP.
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
|
||||
if(istype(bag, /obj/item/storage/backpack/snail))
|
||||
bag.emptyStorage()
|
||||
C.doUnEquip(bag, TRUE, no_move = TRUE)
|
||||
C.temporarilyRemoveItemFromInventory(bag, TRUE)
|
||||
qdel(bag)
|
||||
|
||||
/obj/item/storage/backpack/snail
|
||||
|
||||
Reference in New Issue
Block a user