cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert Clown Spection and Two Person Mecha (temporarily) (#6182)" (#6183)

Browse Source 
This reverts commit 1fd2c0f455.

Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
Funce
2021-06-10 08:21:52 +12:00
committed by GitHub
co-authored by Gandalf
parent 4bd8ab7793
commit 6a3a5d170f
36 changed files with 1400 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paperplane.dm
+14 -4
View File
@@ -123,14 +123,24 @@
if(!Carbon.iscopy && !Carbon.copied)
to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
return
to_chat(user, "<span class='notice'>You fold [src] into the shape of a plane!</span>")
user.temporarilyRemoveItemFromInventory(src)
var/obj/item/paperplane/plane_type = /obj/item/paperplane
//Origami Master
var/datum/action/innate/origami/origami_action = locate() in user.actions
if(origami_action?.active)
plane_type = /obj/item/paperplane/syndicate
make_plane(user, I, /obj/item/paperplane/syndicate)
else
make_plane(user, I, /obj/item/paperplane)
/**
* Paper plane folding
*
* Arguments:
* * mob/living/user - who's folding
* * obj/item/I - what's being folded
* * obj/item/paperplane/plane_type - what it will be folded into (path)
*/
/obj/item/paper/proc/make_plane(mob/living/user, obj/item/I, obj/item/paperplane/plane_type = /obj/item/paperplane)
to_chat(user, "<span class='notice'>You fold [src] into the shape of a plane!</span>")
user.temporarilyRemoveItemFromInventory(src)
I = new plane_type(loc, src)
if(user.Adjacent(I))
user.put_in_hands(I)