cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into bay_equipping

Browse Source 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
This commit is contained in:
Tigercat2000
2016-06-27 08:20:49 -07:00
parent 5d48cc22b7 b537758aef
commit 82091296bd
278 changed files with 14719 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+1 -1
View File
@@ -36,7 +36,7 @@
if(!L.stat)
L.do_alert_animation(L)
egged = 1
to_chat(alerted, sound('sound/machines/chime.ogg'))
alerted << sound('sound/machines/chime.ogg')
..()
/mob/living/proc/do_alert_animation(atom/A)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+6 -6
View File
@@ -179,9 +179,9 @@
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/clothing/head/hardhat/red(src)
@@ -204,9 +204,9 @@
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/head/hardhat(src)
new /obj/item/clothing/head/hardhat(src)
new /obj/item/clothing/head/hardhat(src)
code/game/objects/structures/displaycase.dm
+4 -4
View File
@@ -128,7 +128,7 @@ var/global/list/captain_display_cases = list()
..(user)
to_chat(user, "<span class='notice'>Peering through the glass, you see that it contains:</span>")
if(occupant)
to_chat(user, "\icon[occupant] <span class='notice'>\A [occupant].</span>")
to_chat(user, "[bicon(occupant)] <span class='notice'>\A [occupant].</span>")
else
to_chat(user, "Nothing.")
@@ -217,9 +217,9 @@ var/global/list/captain_display_cases = list()
return
locked = !locked
if(!locked)
to_chat(user, "\icon[src] <span class='notice'>\The [src] clicks as locks release, and it slowly opens for you.</span>")
to_chat(user, "[bicon(src)] <span class='notice'>\The [src] clicks as locks release, and it slowly opens for you.</span>")
else
to_chat(user, "\icon[src] <span class='notice'>You close \the [src] and swipe your card, locking it.</span>")
to_chat(user, "[bicon(src)] <span class='notice'>You close \the [src] and swipe your card, locking it.</span>")
update_icon()
return
if(istype(W,/obj/item/weapon/crowbar) && (!locked || destroyed))
@@ -305,7 +305,7 @@ var/global/list/captain_display_cases = list()
dump()
update_icon()
else
to_chat(src, "\icon[src] <span class='warning'>\The [src] is empty!</span>")
to_chat(src, "[bicon(src)] <span class='warning'>\The [src] is empty!</span>")
else
user.visible_message("[user.name] gently runs his hands over \the [src] in appreciation of its contents.", \
"You gently run your hands over \the [src] in appreciation of its contents.", \
code/game/objects/structures/flora.dm
+17 -3
View File
@@ -191,20 +191,34 @@
icon_state = "fullgrass_[rand(1, 3)]"
/obj/structure/flora/kirbyplants
/obj/item/weapon/twohanded/required/kirbyplants
name = "potted plant"
icon = 'icons/obj/flora/plants.dmi'
icon_state = "plant-1"
anchored = 0
layer = 5
w_class = 5
force = 10
throwforce = 13
throw_speed = 2
throw_range = 4
/obj/structure/flora/kirbyplants/New()
/obj/item/weapon/twohanded/required/kirbyplants/New()
..()
icon_state = "plant-[rand(1,35)]"
if(prob(1))
icon_state = "plant-36"
/obj/structure/flora/kirbyplants/dead
/obj/item/weapon/twohanded/required/kirbyplants/equipped(mob/living/user)
var/image/I = image(icon = 'icons/obj/flora/plants.dmi' , icon_state = src.icon_state, loc = user)
I.override = 1
user.add_alt_appearance("sneaking_mission", I, player_list)
/obj/item/weapon/twohanded/required/kirbyplants/dropped(mob/living/user)
..()
user.remove_alt_appearance("sneaking_mission")
/obj/item/weapon/twohanded/required/kirbyplants/dead
name = "\improper RD's potted plant"
desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
icon_state = "plant-dead"
code/game/objects/structures/mop_bucket.dm
+1 -1
View File
@@ -23,7 +23,7 @@
/obj/structure/mopbucket/examine(mob/user)
if(..(user, 1))
to_chat(usr, text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume))
to_chat(usr, "[bicon(src)] [src] contains [reagents.total_volume] units of water left!")
/obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/mop))
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/movable = 0 // For mobility checks
/obj/structure/stool/bed/MouseDrop(atom/over_object)
..(over_object, 1)
..(over_object, skip_fucking_stool_shit = 1)
/obj/structure/stool/psychbed
name = "psych bed"
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+4 -4
View File
@@ -34,7 +34,7 @@
qdel(src)
return
/obj/structure/stool/MouseDrop(atom/over_object, skip_fucking_stool_shit = 0)
/obj/structure/stool/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params, skip_fucking_stool_shit = 0)
if(skip_fucking_stool_shit)
return ..(over_object)
if (istype(over_object, /mob/living/carbon/human))
@@ -44,7 +44,7 @@
S.origin = src
src.loc = S
H.put_in_hands(S)
H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!")
H.visible_message("<span class='warning'>[H] grabs [src] from the floor!</span>", "<span class='warning'>You grab [src] from the floor!</span>")
/obj/item/weapon/stool
name = "stool"
@@ -60,12 +60,12 @@
..()
origin.loc = get_turf(src)
user.unEquip(src)
user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.")
user.visible_message("<span class='notice'>[user] puts [src] down.</span>", "<span class='notice'>You put [src] down.</span>")
qdel(src)
/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
if (prob(5) && istype(M,/mob/living))
user.visible_message("\red [user] breaks [src] over [M]'s back!.")
user.visible_message("<span class='danger'>[user] breaks [src] over [M]'s back!.</span>")
user.unEquip(src)
var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
m.loc = get_turf(src)