cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes redundant COMPONENT_INCOMPATIBLE crashes (#37389)

Browse Source
This commit is contained in:
Jordan Brown
2018-04-25 06:53:43 -04:00
committed by yogstation13-bot
parent 765bba203b
commit 6dd45dd630
17 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/components/_component.dm
View File

@@ -10,7 +10,7 @@
var/list/arguments = args.Copy(2)
if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE)
qdel(src, TRUE, TRUE)
CRASH("Incompatible [type] assigned to a [P]!")
CRASH("Incompatible [type] assigned to a [P.type]!")
_JoinParent(P)
@@ -233,7 +233,9 @@
//if we're taking to the same thing no need for anything
return
if(C.OnTransfer(src) == COMPONENT_INCOMPATIBLE)
var/c_type = C.type
qdel(C)
CRASH("Incompatible [c_type] transfer attempt to a [type]!")
return
C._RemoveFromParent()
helicopter.SendSignal(COMSIG_COMPONENT_REMOVING, C)