Fixes #477, fixes #478, fixes #481 (#483)

This commit is contained in:
NanakoAC
2016-06-28 00:14:36 +03:00
committed by skull132
parent e50985cf58
commit b0f7a54aa3
7 changed files with 55 additions and 4 deletions
+1 -1
View File
@@ -80,4 +80,4 @@ var/datum/topic_state/air_alarm_topic/air_alarm_topic = new()
extra_href["remote_connection"] = 1
extra_href["remote_access"] = 1
return extra_href
return extra_href
+1 -1
View File
@@ -479,7 +479,7 @@ BLIND // can't see anything
..()
/obj/item/clothing/under/MouseDrop(obj/over_object as obj)
/obj/item/clothing/MouseDrop(obj/over_object as obj)
if (ishuman(usr) || issmall(usr))
//makes sure that the clothing is equipped so that we can't drag it into our hand from miles away.
if (!(src.loc == usr))
+2
View File
@@ -41,6 +41,8 @@
if (pockets)
if (pockets.handle_mousedrop(usr, over_object))
..(over_object)
else
..(over_object)
/obj/item/clothing/suit/armor/attackby(obj/item/W as obj, mob/user as mob)
..()
+10 -2
View File
@@ -13,7 +13,9 @@
var/isalive
/obj/item/weapon/holder/New()
item_state = icon_state
if (!item_state)
item_state = icon_state
..()
processing_objects.Add(src)
@@ -29,7 +31,8 @@
var/atom/movable/mob_container
mob_container = M
mob_container.forceMove(get_turf(src))
mob_container.loc = src.loc//if the holder was placed into a disposal, this should place the animal in the disposal
//mob_container.forceMove(get_turf(src))
M.reset_view()
qdel(src)
@@ -158,6 +161,9 @@
desc_dead = "It's a dead cat."
icon_state = "cat_tabby"
icon_state_dead = "cat_tabby_dead"
item_state = "cat"
//Setting item state to cat saves on some duplication for the in-hand versions, but we cant use it for head.
//Instead, the head versions are done by duplicating the cat
slot_flags = SLOT_HEAD
w_class = 3
@@ -165,6 +171,7 @@
icon_state = "cat_black"
icon_state_dead = "cat_black_dead"
slot_flags = SLOT_HEAD
item_state = "cat"
/obj/item/weapon/holder/cat/kitten
name = "kitten"
@@ -172,6 +179,7 @@
icon_state_dead = "cat_kitten_dead"
slot_flags = SLOT_HEAD
w_class = 1
item_state = "cat"
/obj/item/weapon/holder/borer
@@ -179,10 +179,12 @@
camera.status = powered
/datum/robot_component/camera/install()
installed = 1
if (camera)
camera.status = 1
/datum/robot_component/camera/uninstall()
installed = 0
if (camera)
camera.status = 0
camera.kick_viewers()
+39
View File
@@ -0,0 +1,39 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Nanako
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixed being unable to remove tactical armour"
- bugfix: "Fixed being unable to place held animals into disposal units"
- bugfix: "Fixed missing held/onhead icons for cats"
- bugfix: "Fixed being unable to install robot cameras"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 131 KiB