cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7383 from Segrain/dev-freeze

Browse Source 
Dev-freeze fixes.
This commit is contained in:
PsiOmegaDelta
2014-12-11 06:42:44 +01:00
parent 3f82768cae b1785edf33
commit a906d45b3c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/spacesuits/alien.dm
View File

@@ -17,7 +17,7 @@
item_color = "skrell_helmet_black"
/obj/item/clothing/suit/space/skrell
name = "Skrellian hardsuit"
name = "Skrellian voidsuit"
desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)

4
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -1031,10 +1031,10 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/Topic(href, href_list)
if(usr != src)
return
if(..())
return
if(usr != src)
return
if (href_list["showalerts"])
robot_alerts()