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

fix merge conflicts

Browse Source
This commit is contained in:
Raeschen
2023-06-19 12:32:36 +02:00
parent db38ed93c0
commit 74765cf864
6 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/integrated_electronics/subtypes/manipulation.dm
View File

@@ -204,7 +204,6 @@
pre_attached_grenade_type = /obj/item/weapon/grenade/explosive
origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_COMBAT = 10)
spawn_flags = null // Used for world initializing, see the #defines above.
<<<<<<< HEAD
//CHOMPADDITION: Size Circuit
/obj/item/integrated_circuit/manipulation/Size
@@ -234,5 +233,3 @@
if(target && istype(target,/mob/living/))
target.resize(size/100)
activate_pin(2)
=======
>>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2