shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/craft.dm
+8 -8
View File
@@ -70,14 +70,14 @@
if(T.Adjacent(user))
for(var/B in T)
var/atom/movable/AM = B
if(AM.flags & HOLOGRAM)
if(HAS_SECONDARY_FLAG(AM, HOLOGRAM))
continue
. += AM
/datum/personal_crafting/proc/get_surroundings(mob/user)
. = list()
for(var/obj/item/I in get_environment(user))
if(I.flags & HOLOGRAM)
if(HAS_SECONDARY_FLAG(I, HOLOGRAM))
continue
if(istype(I, /obj/item/stack))
var/obj/item/stack/S = I
@@ -296,26 +296,26 @@
ui_interact(usr) //explicit call to show the busy display
var/fail_msg = construct_item(usr, TR)
if(!fail_msg)
usr << "<span class='notice'>[TR.name] constructed.</span>"
to_chat(usr, "<span class='notice'>[TR.name] constructed.</span>")
else
usr << "<span class='warning'>Construction failed[fail_msg]</span>"
to_chat(usr, "<span class='warning'>Construction failed[fail_msg]</span>")
busy = 0
ui_interact(usr)
if("forwardCat") //Meow
viewing_category = next_cat()
usr << "<span class='notice'>Category is now [categories[viewing_category]].</span>"
to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
. = TRUE
if("backwardCat")
viewing_category = prev_cat()
usr << "<span class='notice'>Category is now [categories[viewing_category]].</span>"
to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
. = TRUE
if("toggle_recipes")
display_craftable_only = !display_craftable_only
usr << "<span class='notice'>You will now [display_craftable_only ? "only see recipes you can craft":"see all recipes"].</span>"
to_chat(usr, "<span class='notice'>You will now [display_craftable_only ? "only see recipes you can craft":"see all recipes"].</span>")
. = TRUE
if("toggle_compact")
display_compact = !display_compact
usr << "<span class='notice'>Crafting menu is now [display_compact? "compact" : "full size"].</span>"
to_chat(usr, "<span class='notice'>Crafting menu is now [display_compact? "compact" : "full size"].</span>")
. = TRUE
code/modules/crafting/recipes.dm
+9 -1
View File
@@ -35,7 +35,8 @@
result = /obj/item/weapon/twohanded/spear
reqs = list(/obj/item/weapon/twohanded/spear = 1,
/obj/item/weapon/grenade = 1)
parts = list(/obj/item/weapon/grenade = 1)
parts = list(/obj/item/weapon/twohanded/spear = 1,
/obj/item/weapon/grenade = 1)
time = 15
category = CAT_WEAPON
@@ -444,3 +445,10 @@
time = 10
reqs = list(/obj/item/stack/sheet/cardboard = 1)
category = CAT_MISC
/datum/crafting_recipe/pressureplate
name = "Pressure Plate"
result = /obj/item/device/pressure_plate
time = 5
reqs = list(/obj/item/stack/sheet/plasteel = 1, /obj/item/stack/tile = 1, /obj/item/stack/cable_coil = 2)
category = CAT_MISC