cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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

5
code/modules/reagents/readme.md
View File

@@ -191,7 +191,8 @@ About Reagents:
glass_desc
Ditto for glass desciption.
glass_center_of_mass
glass_center_of_mass_x
glass_center_of_mass_y
Used for glass placement on tables.
color
@@ -302,4 +303,4 @@ About the Tools:
transfer code since you will not be able to use the standard
tools to manipulate it.
*/
*/

32
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -193,8 +193,8 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 11
matter = list(MAT_GLASS = 500)
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
@@ -250,8 +250,8 @@
name = "large beaker"
desc = "A large beaker."
icon_state = "beakerlarge"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 11
matter = list(MAT_GLASS = 5000)
volume = 120
amount_per_transfer_from_this = 10
@@ -263,8 +263,8 @@
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions."
icon_state = "beakernoreact"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 13 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 13
matter = list(MAT_GLASS = 500)
volume = 60
amount_per_transfer_from_this = 10
@@ -274,8 +274,8 @@
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology."
icon_state = "beakerbluespace"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 11 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 11
matter = list(MAT_GLASS = 5000)
volume = 300
amount_per_transfer_from_this = 10
@@ -287,8 +287,8 @@
name = "vial"
desc = "A small glass vial."
icon_state = "vial"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 9 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 9
matter = list(MAT_GLASS = 250)
volume = 30
w_class = ITEMSIZE_TINY
@@ -307,8 +307,8 @@
name = "stoppered bottle"
desc = "A stoppered bottle for keeping beverages fresh."
icon_state = "stopperedbottle"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 13 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 13
volume = 120
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,60,120)
@@ -320,8 +320,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "bucket"
item_state = "bucket"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
matter = list(MAT_STEEL = 200)
w_class = ITEMSIZE_NORMAL
amount_per_transfer_from_this = 20
@@ -383,8 +383,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "woodbucket"
item_state = "woodbucket"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 8 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 8
matter = list(MAT_WOOD = 50)
w_class = ITEMSIZE_LARGE
amount_per_transfer_from_this = 20

16
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -4,8 +4,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner"
item_state = "cleaner"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
flags = OPENCONTAINER|NOBLUDGEON
matter = list(MAT_GLASS = 300, MAT_STEEL = 300)
slot_flags = SLOT_BELT
@@ -126,8 +126,8 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "pepperspray"
item_state = "pepperspray"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
possible_transfer_amounts = null
volume = 40
var/safety = TRUE
@@ -175,8 +175,8 @@
icon_state = "chemsprayer"
item_state = "chemsprayer"
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 16 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 16
throwforce = 3
w_class = ITEMSIZE_NORMAL
possible_transfer_amounts = null
@@ -222,8 +222,8 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner-industrial"
item_state = "cleaner"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 10
possible_transfer_amounts = list(5,10,20)

4
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -16,8 +16,8 @@
icon = 'icons/goonstation/objects/syringe_vr.dmi'
item_state = "syringe_0"
icon_state = "0"
center_of_mass_x = 16 //CHOMPEdit
center_of_mass_y= 14 //CHOMPEdit
center_of_mass_x = 16
center_of_mass_y = 14
matter = list(MAT_GLASS = 150)
amount_per_transfer_from_this = 5
possible_transfer_amounts = null

3
code/modules/reagents/reagents/_reagents.dm
View File

@@ -32,7 +32,8 @@
var/cup_icon_state = null
var/cup_name = null
var/cup_desc = null
var/cup_center_of_mass = null
var/cup_center_of_mass_x = 0
var/cup_center_of_mass_y = 0
var/cup_prefix = null
var/color = "#000000"