cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] removes center of mass list (#10081)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-07 07:08:58 -07:00
committed by GitHub
parent 1001f0408b
commit 499e8e7ee9
44 changed files with 1417 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/items.dm
View File

@@ -1062,12 +1062,11 @@ closest to where the cursor has clicked on.
Note: This proc can be overwritten to allow for different types of auto-alignment.
*/
///obj/item/var/list/center_of_mass = list("x" = 16,"y" = 16) CHOMPEdit NO STOP PLEASE -- center_of_mass - 52.0879 mb total
/obj/item/var/center_of_mass_x = 16 //CHOMPEdit
/obj/item/var/center_of_mass_y = 16 //CHOMPEdit
/obj/item/var/center_of_mass_x = 16
/obj/item/var/center_of_mass_y = 16
/proc/auto_align(obj/item/W, click_parameters, var/animate = FALSE)
if(!W.center_of_mass_x && !W.center_of_mass_y) //CHOMPEdit
if(!W.center_of_mass_x && !W.center_of_mass_y)
W.randpixel_xy()
return
@@ -1083,8 +1082,8 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen
var/cell_x = max(0, min(CELLS-1, round(mouse_x/CELLSIZE)))
var/cell_y = max(0, min(CELLS-1, round(mouse_y/CELLSIZE)))
var/target_x = (CELLSIZE * (0.5 + cell_x)) - W.center_of_mass_x //CHOMPEdit
var/target_y = (CELLSIZE * (0.5 + cell_y)) - W.center_of_mass_y //CHOMPEdit
var/target_x = (CELLSIZE * (0.5 + cell_x)) - W.center_of_mass_x
var/target_y = (CELLSIZE * (0.5 + cell_y)) - W.center_of_mass_y
if(animate)
var/dist_x = abs(W.pixel_x - target_x)
var/dist_y = abs(W.pixel_y - target_y)

12
code/game/objects/items/devices/flashlight.dm
View File

@@ -313,8 +313,8 @@
desc = "A desk lamp with an adjustable mount."
icon_state = "lamp"
force = 10
center_of_mass_x = 13 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 13
center_of_mass_y = 11
light_range = 5
w_class = ITEMSIZE_LARGE
power_use = 0
@@ -333,16 +333,16 @@
/obj/item/flashlight/lamp/green
desc = "A classic green-shaded desk lamp."
icon_state = "lampgreen"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 11
light_color = "#FFC58F"
// clown lamp
/obj/item/flashlight/lamp/clown
desc = "A whacky banana peel shaped lamp."
icon_state = "bananalamp"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 11
/*

4
code/game/objects/items/stacks/stack.dm
View File

@@ -14,8 +14,8 @@
origin_tech = list(TECH_MATERIAL = 1)
icon = 'icons/obj/stacks_ch.dmi' //CHOMPedit - materials update
randpixel = 7
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
var/list/datum/stack_recipe/recipes
var/singular_name
var/amount = 1

4
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -25,8 +25,8 @@
icon = 'icons/obj/boxes.dmi'
icon_state = "box"
item_state = "syringe_kit"
center_of_mass_x = 13 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 13
center_of_mass_y = 10
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
var/trash = null // if set, can be crushed into a trash item when empty
max_w_class = ITEMSIZE_SMALL

4
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -52,8 +52,8 @@
icon_state = "eggbox"
icon_type = REAGENT_ID_EGG
name = "egg box"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 7
storage_slots = 12
can_hold = list(
/obj/item/reagent_containers/food/snacks/egg,

4
code/game/objects/items/weapons/storage/misc.dm
View File

@@ -33,8 +33,8 @@ var/list/random_weighted_donuts = list(
icon_state = "donutbox"
name = "donut box"
desc = "A box that holds tasty donuts, if you're lucky."
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 9
max_storage_space = ITEMSIZE_COST_SMALL * 6
can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard

4
code/game/objects/items/weapons/storage/toolbox.dm
View File

@@ -7,8 +7,8 @@
icon = 'icons/obj/storage_vr.dmi'
icon_state = "red"
item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red")
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 11
force = 10
throwforce = 10
throw_speed = 1

4
code/game/objects/items/weapons/tools/screwdriver.dm
View File

@@ -7,8 +7,8 @@
//description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave. //CHOMP Remove
icon = 'icons/obj/tools.dmi'
icon_state = "screwdriver"
center_of_mass_x = 13 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 13
center_of_mass_y = 7
slot_flags = SLOT_BELT | SLOT_EARS
force = 6
w_class = ITEMSIZE_TINY

4
code/game/objects/items/weapons/tools/wirecutters.dm
View File

@@ -8,8 +8,8 @@
icon = 'icons/obj/tools.dmi'
icon_state = "cutters"
item_state = "cutters"
center_of_mass_x = 18 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 18
center_of_mass_y = 10
slot_flags = SLOT_BELT
force = 6
throw_speed = 2

4
code/game/objects/items/weapons/traps.dm
View File

@@ -13,8 +13,8 @@
icon_state = "beartrap0"
desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off."
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
throwforce = 0
w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1)

4
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -268,8 +268,8 @@
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded_rollerbed"
center_of_mass_x = 17 //CHOMPEdit
center_of_mass_y= 7 //CHOMPEdit
center_of_mass_x = 17
center_of_mass_y = 7
slot_flags = SLOT_BACK
w_class = ITEMSIZE_LARGE
var/rollertype = /obj/item/roller

4
code/game/objects/structures/stool_bed_chair_nest/stools.dm
View File

@@ -7,8 +7,8 @@ var/global/list/stool_cache = list() //haha stool
icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
icon_state = "stool_preview" //set for the map
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
force = 10
throwforce = 10
w_class = ITEMSIZE_HUGE

4
code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
View File

@@ -4,8 +4,8 @@
icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
icon_state = "bar_stool_preview" //set for the map
randpixel = 0
center_of_mass_x = 0 //CHOMPEdit
center_of_mass_y = 0 //CHOMPEdit
center_of_mass_x = 0
center_of_mass_y = 0
force = 10
throwforce = 10
w_class = ITEMSIZE_HUGE