cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4542 from Stevenator1/MagnetsHowDoTheyWork

Browse Source 
Fix uses of TECH_MAGNETS to TECH_MAGNET
This commit is contained in:
Anewbe
2018-01-15 11:15:27 -06:00
committed by GitHub
parent 14007295ed cd59a2e928
commit d33e5a1304
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/devices/multitool.dm
View File

@@ -44,4 +44,4 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "multitool"
toolspeed = 0.1
origin_tech = list(TECH_MAGNETS = 5, TECH_ENGINEERING = 5)
origin_tech = list(TECH_MAGNET = 5, TECH_ENGINEERING = 5)

4
code/modules/xenobio/items/slime_objects.dm
View File

@@ -77,7 +77,7 @@
icon = 'icons/obj/objects.dmi'
icon_state = "slime_crystal_small"
w_class = ITEMSIZE_TINY
origin_tech = list(TECH_MAGNETS = 6, TECH_BLUESPACE = 3)
origin_tech = list(TECH_MAGNET = 6, TECH_BLUESPACE = 3)
force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things
/obj/item/slime_crystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
@@ -109,7 +109,7 @@
icon_state = "slime_crystal_large"
uses = 1
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MAGNETS = 5, TECH_BLUESPACE = 4)
origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 4)