cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes some non-existant typepaths (#27362)

Browse Source 
* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE

* Removes some non-existant typepaths

* yes
This commit is contained in:
Contrabang
2024-11-30 12:04:03 +00:00
committed by GitHub
parent fca84e2e7e
commit 734d0166a0
70 changed files with 252 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/forcefields.dm
+1 -1
View File
@@ -59,7 +59,7 @@
desc = "You have a bad feeling about this."
max_integrity = 80
/obj/effect/forcefield/mime/advanced
/obj/effect/forcefield/mime
icon_state = null
name = "invisible blockade"
desc = "You might be here a while."
code/game/objects/effects/landmarks.dm
+2 -2
View File
@@ -450,7 +450,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
/obj/effect/landmark/costume/madscientist/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/misc/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/under/misc/gimmick_captain_suit(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
new /obj/item/clothing/glasses/gglasses(src.loc)
@@ -458,7 +458,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
/obj/effect/landmark/costume/elpresidente/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/misc/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/under/misc/gimmick_captain_suit(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
new /obj/item/clothing/shoes/jackboots(src.loc)
code/game/objects/effects/spawners/depot_spawners.dm
+3 -3
View File
@@ -58,7 +58,7 @@
/obj/effect/spawner/random/syndicate/trapped_documents
name = "50pc trapped documents"
icon_state = "folder"
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
spawn_inside = /obj/structure/closet/secure_closet/depot
loot = list(
/obj/item/documents/syndicate/yellow,
/obj/item/documents/syndicate/yellow/trapped,
@@ -66,7 +66,7 @@
// Loot
/obj/effect/spawner/random/syndicate/loot
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
spawn_inside = /obj/structure/closet/secure_closet/depot
/obj/effect/spawner/random/syndicate/loot/common
name = "syndicate depot loot, common"
@@ -160,7 +160,7 @@
/obj/effect/spawner/random/syndicate/loot/armory
name = "syndicate depot loot, armory"
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory
spawn_inside = /obj/structure/closet/secure_closet/depot/armory
// Combat orientated items that could give the player an advantage if an antag messes with them.
loot = list(
/obj/item/autosurgeon/organ/syndicate/oneuse/razorwire,
code/game/objects/effects/spawners/lootdrop.dm
+1 -1
View File
@@ -539,7 +539,7 @@
/obj/item/clothing/under/solgov/elite = 50,
/obj/item/clothing/under/solgov/command = 50,
/obj/item/clothing/under/retro/security = 50,
/obj/item/clothing/under/misc/gimmick/rank/captain/suit = 50,
/obj/item/clothing/under/misc/gimmick_captain_suit = 50,
/obj/item/clothing/under/misc/durathread = 50,
/obj/item/clothing/under/psysuit = 50,
/obj/item/clothing/under/costume/cuban_suit = 50,
code/game/objects/effects/spawners/random/misc_spawners.dm
+2 -2
View File
@@ -74,7 +74,7 @@
/obj/effect/spawner/random/book/record_item(type_path_to_make)
SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/book]")
/obj/effect/spawner/random/mod/maint
/obj/effect/spawner/random/mod_maint
name = "maint MOD module spawner"
loot = list(
/obj/item/mod/module/springlock = 2,
@@ -83,7 +83,7 @@
)
record_spawn = TRUE
/obj/effect/spawner/random/janitor/supplies
/obj/effect/spawner/random/jani_supplies
icon = 'icons/effects/random_spawners.dmi'
icon_state = "mopbucket"
name = "janitorial supplies spawner"
code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm
+2 -2
View File
@@ -7,7 +7,7 @@
trigger_causes = BIOCHIP_TRIGGER_DEATH_ANY
implant_state = "implant-alien"
var/obj/machinery/grey_autocloner/linked
var/datum/dna2/record/our_record
var/datum/dna2_record/our_record
/obj/item/bio_chip/grey_autocloner/Destroy()
linked = null
@@ -26,7 +26,7 @@
. = ..()
if(!. || !ishuman(imp_in))
return FALSE
our_record = new /datum/dna2/record()
our_record = new /datum/dna2_record()
our_record.ckey = imp_in.ckey
var/obj/item/organ/B = imp_in.get_int_organ(/obj/item/organ/internal/brain)
B.dna.check_integrity()
code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm
+3 -3
View File
@@ -1,4 +1,4 @@
/obj/item/storage/hidden/implant
/obj/item/storage/hidden_implant
name = "bluespace pocket"
storage_slots = 2
max_w_class = WEIGHT_CLASS_NORMAL
@@ -17,11 +17,11 @@
implant_data = /datum/implant_fluff/storage
implant_state = "implant-syndicate"
var/obj/item/storage/hidden/implant/storage
var/obj/item/storage/hidden_implant/storage
/obj/item/bio_chip/storage/Initialize(mapload)
. = ..()
storage = new /obj/item/storage/hidden/implant(src)
storage = new /obj/item/storage/hidden_implant(src)
/obj/item/bio_chip/storage/emp_act(severity)
..()
code/game/objects/items/weapons/caution.dm
+1 -1
View File
@@ -71,7 +71,7 @@
name = "proximity mine dispenser"
icon = 'icons/obj/janitor.dmi'
icon_state = "caution"
energy_type = /datum/robot_storage/energy/janitor/landmine
energy_type = /datum/robot_storage/energy/jani_landmine
is_cyborg = TRUE
/obj/item/stack/caution/proximity_sign/malf/afterattack(atom/target, mob/user, proximity)
code/game/objects/items/weapons/disks.dm
+1 -1
View File
@@ -9,7 +9,7 @@
/obj/item/disk/data
name = "Cloning Data Disk"
icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
var/datum/dna2/record/buf = null
var/datum/dna2_record/buf = null
var/read_only = FALSE //Well,it's still a floppy disk
/obj/item/disk/data/proc/initialize_data()
code/game/objects/items/weapons/dna_injector.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "dnainjector"
belt_icon = "syringe"
var/block = 0
var/datum/dna2/record/buf = null
var/datum/dna2_record/buf = null
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_TINY
code/game/objects/items/weapons/storage/belt.dm
+1 -1
View File
@@ -35,7 +35,7 @@
update_weight()
/obj/item/storage/belt/can_be_inserted(obj/item/I, stop_messages = FALSE)
if(isstorage(loc) && !istype(loc, /obj/item/storage/backpack/holding) && !istype(loc, /obj/item/storage/hidden/implant) && !storable)
if(isstorage(loc) && !istype(loc, /obj/item/storage/backpack/holding) && !istype(loc, /obj/item/storage/hidden_implant) && !storable)
to_chat(usr, "<span class='warning'>You can't seem to fit [I] into [src].</span>")
return FALSE
. = ..()
code/game/objects/structures/crates_lockers/closets/malfunction.dm
+2 -2
View File
@@ -1,9 +1,9 @@
/obj/structure/closet/malf/suits
/obj/structure/closet/malf_suits
desc = "It's a storage unit for operational gear."
icon_state = "syndicate"
/obj/structure/closet/malf/suits/populate_contents()
/obj/structure/closet/malf_suits/populate_contents()
new /obj/item/tank/jetpack/void(src)
new /obj/item/clothing/mask/breath(src)
new /obj/effect/nasavoidsuitspawner(src)
code/game/objects/structures/crates_lockers/closets/secure/depot_closets.dm
+11 -11
View File
@@ -1,4 +1,4 @@
/obj/structure/closet/secure_closet/syndicate/depot
/obj/structure/closet/secure_closet/depot
name = "depot supply closet"
desc = "A red and black lootbox full of things the Head of Security is going to flip their shit over."
locked = FALSE
@@ -9,20 +9,20 @@
var/is_armory = FALSE
var/ignore_use = FALSE
/obj/structure/closet/secure_closet/syndicate/depot/emag_act()
/obj/structure/closet/secure_closet/depot/emag_act()
. = ..()
loot_pickup()
/obj/structure/closet/secure_closet/syndicate/depot/open()
/obj/structure/closet/secure_closet/depot/open()
. = ..()
if(opened)
loot_pickup()
/obj/structure/closet/secure_closet/syndicate/depot/dump_contents()
/obj/structure/closet/secure_closet/depot/dump_contents()
loot_pickup()
. = ..()
/obj/structure/closet/secure_closet/syndicate/depot/proc/loot_pickup()
/obj/structure/closet/secure_closet/depot/proc/loot_pickup()
if(!ignore_use)
var/area/syndicate_depot/core/depotarea = get_area(src)
if(istype(depotarea))
@@ -30,33 +30,33 @@
if(is_armory)
depotarea.armory_locker_looted()
/obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M)
/obj/structure/closet/secure_closet/depot/attack_animal(mob/M)
if(isanimal(M) && ("syndicate" in M.faction))
to_chat(M, "<span class='warning'>[src] resists your attack!</span>")
return
return ..()
/obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params)
/obj/structure/closet/secure_closet/depot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/rcs))
to_chat(user, "<span class='warning'>Bluespace interference prevents [W] from locking onto [src]!</span>")
return
return ..()
/obj/structure/closet/secure_closet/syndicate/depot/emp_act(severity)
/obj/structure/closet/secure_closet/depot/emp_act(severity)
return
/obj/structure/closet/secure_closet/syndicate/depot/togglelock(mob/user)
/obj/structure/closet/secure_closet/depot/togglelock(mob/user)
. = ..()
if(!locked)
loot_pickup()
/obj/structure/closet/secure_closet/syndicate/depot/attack_ghost(mob/user)
/obj/structure/closet/secure_closet/depot/attack_ghost(mob/user)
if(user.can_advanced_admin_interact())
ignore_use = TRUE
toggle(user)
ignore_use = FALSE
/obj/structure/closet/secure_closet/syndicate/depot/armory
/obj/structure/closet/secure_closet/depot/armory
req_access = list(ACCESS_SYNDICATE)
is_armory = TRUE
icon_state = "armory"
code/game/objects/structures/grey_autocloner.dm
+1 -1
View File
@@ -31,7 +31,7 @@
autoclone.linked = src
atom_say("Link confirmed!")
/obj/machinery/grey_autocloner/proc/growclone(datum/dna2/record/R)
/obj/machinery/grey_autocloner/proc/growclone(datum/dna2_record/R)
if(attempting || stat & (NOPOWER|BROKEN))
return FALSE
clonemind = locateUID(R.mind)
code/game/objects/structures/lavaland/ladder.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/structure/ladder/unusable
/obj/structure/ladder
name = "shattered ladder"
desc = "The shattered remnants of a ladder hanging over the pitch-black chasm, providing no safe route to the abyss beneath. Its fractured rungs suggest an inevitable plunge, as if the remainder might soon join the void."
icon = 'icons/obj/structures.dmi'