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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-23 22:51:08 -04:00
committed by GitHub
parent 2b3041e7b6
commit 07cf2edc05
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/machinery/frame.dm
View File

@@ -214,16 +214,6 @@
x_offset = 24 x_offset = 24
y_offset = 24 y_offset = 24
<<<<<<< HEAD
/datum/frame/frame_types/geiger //yw edit start
name = "Geiger Counter"
frame_class = FRAME_CLASS_ALARM
frame_size = 2
frame_style = FRAME_STYLE_WALL
x_offset = 28
y_offset = 28 //yw edit ends
||||||| parent of 445effcaf5... Merge pull request #10398 from VOREStation/upstream-merge-8095
=======
/datum/frame/frame_types/geiger /datum/frame/frame_types/geiger
name = "Geiger Counter" name = "Geiger Counter"
frame_class = FRAME_CLASS_ALARM frame_class = FRAME_CLASS_ALARM
@@ -232,7 +222,6 @@
x_offset = 28 x_offset = 28
y_offset = 28 y_offset = 28
>>>>>>> 445effcaf5... Merge pull request #10398 from VOREStation/upstream-merge-8095
////////////////////////////// //////////////////////////////
// Frame Object (Structure) // Frame Object (Structure)
////////////////////////////// //////////////////////////////