cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

Browse Source
This commit is contained in:
Ccomp5950
2014-05-24 19:02:16 -05:00
parent e71add0d26 3b8ee547c6
commit ff0d667337
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__HELPERS/unsorted.dm
View File

@@ -721,13 +721,14 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
var/delayfraction = round(delay/numticks) var/delayfraction = round(delay/numticks)
var/original_loc = user.loc var/original_loc = user.loc
var/original_turf = get_turf(user)
var/holding = user.get_active_hand() var/holding = user.get_active_hand()
for(var/i = 0, i<numticks, i++) for(var/i = 0, i<numticks, i++)
sleep(delayfraction) sleep(delayfraction)
if(!user || user.stat || user.weakened || user.stunned || (user.loc != original_loc)) if(!user || user.stat || user.weakened || user.stunned || user.loc != original_loc || get_turf(user) != original_turf)
return 0 return 0
if(needhand && !(user.get_active_hand() == holding)) //Sometimes you don't want the user to have to keep their active hand if(needhand && !(user.get_active_hand() == holding)) //Sometimes you don't want the user to have to keep their active hand
return 0 return 0

4
code/game/machinery/hologram.dm
View File

@@ -78,13 +78,13 @@ var/const/HOLOPAD_MODE = 0
/*This is the proc for special two-way communication between AI and holopad/people talking near holopad. /*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
For the other part of the code, check silicon say.dm. Particularly robot talk.*/ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text) /obj/machinery/hologram/holopad/hear_talk(mob/living/M, text, verb)
if(M&&hologram&&master)//Master is mostly a safety in case lag hits or something. if(M&&hologram&&master)//Master is mostly a safety in case lag hits or something.
if(!master.say_understands(M))//The AI will be able to understand most mobs talking through the holopad. if(!master.say_understands(M))//The AI will be able to understand most mobs talking through the holopad.
text = stars(text) text = stars(text)
var/name_used = M.GetVoice() var/name_used = M.GetVoice()
//This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only. //This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> <span class='message'>[M.say_quote(text)]</span></span></i>" var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> [verb], <span class='message'>\"[text]\"</span></span></i>"
master.show_message(rendered, 2) master.show_message(rendered, 2)
return return

1
code/game/objects/items/bodybag.dm
View File

@@ -5,6 +5,7 @@
desc = "A folded bag designed for the storage and transportation of cadavers." desc = "A folded bag designed for the storage and transportation of cadavers."
icon = 'icons/obj/bodybag.dmi' icon = 'icons/obj/bodybag.dmi'
icon_state = "bodybag_folded" icon_state = "bodybag_folded"
w_class = 2.0
attack_self(mob/user) attack_self(mob/user)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)

2
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -464,7 +464,7 @@
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
storage_slots=21 storage_slots=21
can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb") can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb")
max_combined_w_class = 21 max_combined_w_class = 42 //holds 21 items of w_class 2
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/lights/bulbs/New() /obj/item/weapon/storage/box/lights/bulbs/New()

2
code/modules/client/preferences.dm
View File

@@ -561,7 +561,7 @@ datum/preferences
return return
proc/SetAntagoptions(mob/user) proc/SetAntagoptions(mob/user)
if(uplinklocation == "") if(uplinklocation == "" || !uplinklocation)
uplinklocation = "PDA" uplinklocation = "PDA"
var/HTML = "<body>" var/HTML = "<body>"
HTML += "<tt><center>" HTML += "<tt><center>"

2
code/modules/mob/living/carbon/human/human_defines.dm
View File

@@ -29,7 +29,7 @@
var/b_type = "A+" //Player's bloodtype var/b_type = "A+" //Player's bloodtype
var/underwear = 1 //Which underwear the player wants var/underwear = 1 //Which underwear the player wants
var/undershirt = 1 //Which undershirt the player wants. var/undershirt = 0 //Which undershirt the player wants.
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack. var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
//Equipment slots //Equipment slots