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

Merge Conflict Fix, Attempt 2

Browse Source
This commit is contained in:
FalseIncarnate
2015-05-27 01:07:19 -04:00
parent 28347540b6 d5f7f49c08
commit a1cce51559
252 changed files with 1849 additions and 4694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/bags.dm
+1 -1
View File
@@ -378,7 +378,7 @@
else
playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
if(ishuman(M) || ismonkey(M))
if(ishuman(M))
if(prob(10))
M.Weaken(2)
code/game/objects/items/weapons/storage/boxes.dm
+2 -1
View File
@@ -411,7 +411,7 @@
for(var/i = 1; i <= 5; i++)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
/*
/obj/item/weapon/storage/box/wolpincubes
name = "wolpin cube box"
desc = "Drymate brand wolpin cubes. Just add water!"
@@ -423,6 +423,7 @@
..()
for(var/i = 1; i <= 5; i++)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src)
*/
/obj/item/weapon/storage/box/permits
name = "box of construction permits"
code/game/objects/items/weapons/storage/firstaid.dm
+1 -1
View File
@@ -168,7 +168,7 @@
/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
if (ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
var/mob/M = usr
if (!( istype(over_object, /obj/screen) ))
return ..()
code/game/objects/items/weapons/storage/internal.dm
+1 -1
View File
@@ -26,7 +26,7 @@
//returns 1 if the master item's parent's MouseDrop() should be called, 0 otherwise. It's strange, but no other way of
//doing it without the ability to call another proc's parent, really.
/obj/item/weapon/storage/internal/proc/handle_mousedrop(mob/user as mob, obj/over_object as obj)
if (ishuman(user) || ismonkey(user)) //so monkeys can take off their backpacks -- Urist
if (ishuman(user)) //so monkeys can take off their backpacks -- Urist
if (istype(user.loc,/obj/mecha)) // stops inventory actions in a mech
return 0
code/game/objects/items/weapons/storage/storage.dm
+1 -1
View File
@@ -25,7 +25,7 @@
var/use_sound = "rustle" //sound played when used. null for no sound.
/obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
if (ishuman(usr) || ismonkey(usr)) //so monkeys can take off their backpacks -- Urist
if (ishuman(usr)) //so monkeys can take off their backpacks -- Urist
var/mob/M = usr
if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech