mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-18 11:30:35 +01:00
Merge branch 'upstream/development' into development
# Conflicts: # code/_helpers/time.dm # code/game/objects/items/devices/floor_painter.dm # code/game/objects/items/stacks/medical.dm # code/global.dm # code/modules/cargo/randomstock.dm # code/modules/mob/living/carbon/human/human_defense.dm # code/modules/mob/living/simple_animal/simple_animal.dm # code/modules/mob/mob_movement.dm # code/modules/paperwork/faxmachine.dm
This commit is contained in:
@@ -756,7 +756,11 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
|
||||
switch(disintegrate)
|
||||
if(DROPLIMB_EDGE)
|
||||
// compile_icon() used to be here, but it's causing issues, so RIP.
|
||||
add_blood(victim)
|
||||
var/matrix/M = matrix()
|
||||
M.Turn(rand(180))
|
||||
src.transform = M
|
||||
if(!clean)
|
||||
//Throw limb around.
|
||||
if(src && istype(loc,/turf))
|
||||
|
||||
Reference in New Issue
Block a user