mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-20 20:54:35 +01:00
[MIRROR] Fix some more issues (#12321)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
b13d66ff41
commit
16dfa3fc1e
@@ -148,7 +148,7 @@
|
||||
icon = 'icons/obj/directional_test.dmi'
|
||||
|
||||
/obj/item/tool/screwdriver/test_driver/Initialize(mapload)
|
||||
..()
|
||||
. = ..()
|
||||
icon_state = "screwdriver"
|
||||
AddComponent(/datum/component/reactive_icon_update, directions = list(NORTH, EAST, SOUTH, WEST, SOUTHWEST, SOUTHEAST, NORTHEAST, NORTHWEST), range = 3)
|
||||
|
||||
|
||||
@@ -27,8 +27,10 @@ var/list/holder_mob_icon_cache = list()
|
||||
var/original_vis_flags = NONE
|
||||
|
||||
/obj/item/holder/Initialize(mapload, mob/held)
|
||||
ASSERT(ismob(held))
|
||||
. = ..()
|
||||
if(!ismob(held))
|
||||
stack_trace("Holder was not passed a mob.")
|
||||
return INITIALIZE_HINT_QDEL
|
||||
held.forceMove(src)
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
|
||||
@@ -199,6 +199,7 @@
|
||||
item_type = "tool"
|
||||
var/possible_object_paths = list()
|
||||
possible_object_paths += subtypesof(/obj/item/tool)
|
||||
possible_object_paths -= /obj/item/tool/screwdriver/test_driver
|
||||
var/new_tool = pick(possible_object_paths)
|
||||
new_item = new new_tool(src.loc)
|
||||
new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255))
|
||||
|
||||
@@ -55,9 +55,6 @@ BAN_LEGACY_SYSTEM
|
||||
## Non-automatic antagonist recruitment, such as being converted to cultism is not affected. Has the same database requirements and notes as USE_AGE_RESTRICTION_FOR_JOBS.
|
||||
#USE_AGE_RESTRICTION_FOR_ANTAGS
|
||||
|
||||
## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental
|
||||
#USE_RECURSIVE_EXPLOSIONS
|
||||
|
||||
## Configure how fast explosion strength diminishes when travelling up/down z levels. All explosion distances are multiplied by this each time they go up/down z-levels.
|
||||
#MULTI_Z_EXPLOSION_SCALAR 0.5
|
||||
|
||||
|
||||
Reference in New Issue
Block a user