cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 11:06:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #974 from Zuhayr/master

Browse Source 
Corrects several Teshari code and icon issues.
This commit is contained in:
Neerti
2016-02-13 00:39:50 -05:00
parent 831d683aeb 51842ce8fa
commit 8ccfcc87ca
5 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/windowdoor.dm
+1 -2
View File
@@ -72,12 +72,11 @@
sleep(50)
close()
return
var/mob/M = AM // we've returned by here if M is not a mob
if (!( ticker ))
return
if (src.operating)
return
if (src.density && !issmall(M) && src.allowed(AM))
if (src.density && src.allowed(AM))
open()
if(src.check_access(null))
sleep(50)
code/game/machinery/suit_storage_unit.dm
+1 -6
View File
@@ -593,7 +593,7 @@
//Departments that the cycler can paint suits to look like.
var/list/departments = list("Engineering","Mining","Medical","Security","Atmos")
//Species that the suits can be configured to fit.
var/list/species = list("Human","Skrell","Unathi","Tajara")
var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari")
var/target_department
var/target_species
@@ -622,35 +622,30 @@
model_text = "Engineering"
req_access = list(access_construction)
departments = list("Engineering","Atmos")
species = list("Human","Tajara","Skrell","Unathi") //Add Unathi when sprites exist for their suits.
/obj/machinery/suit_cycler/mining
name = "Mining suit cycler"
model_text = "Mining"
req_access = list(access_mining)
departments = list("Mining")
species = list("Human","Tajara","Skrell","Unathi")
/obj/machinery/suit_cycler/security
name = "Security suit cycler"
model_text = "Security"
req_access = list(access_security)
departments = list("Security")
species = list("Human","Tajara","Skrell","Unathi")
/obj/machinery/suit_cycler/medical
name = "Medical suit cycler"
model_text = "Medical"
req_access = list(access_medical)
departments = list("Medical")
species = list("Human","Tajara","Skrell","Unathi")
/obj/machinery/suit_cycler/syndicate
name = "Nonstandard suit cycler"
model_text = "Nonstandard"
req_access = list(access_syndicate)
departments = list("Mercenary")
species = list("Human","Tajara","Skrell","Unathi", "Teshari")
can_repair = 1
/obj/machinery/suit_cycler/attack_ai(mob/user as mob)
code/modules/mob/holder.dm
+3 -2
View File
@@ -98,8 +98,9 @@ var/list/holder_mob_icon_cache = list()
/mob/living/MouseDrop(var/atom/over_object)
var/mob/living/carbon/human/H = over_object
if(holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP))
get_scooped(H, (usr == src))
if(holder_type && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP))
if(!issmall(H) || !istype(src, /mob/living/carbon/human))
get_scooped(H, (usr == src))
return
return ..()