diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 498fc3b4d61..4d7d210e363 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/code/defines/obj/clothing/gloves.dm @@ -162,10 +162,7 @@ name = "botanist's leather gloves" icon_state = "leather" item_state = "ggloves" - siemens_coefficient = 0.50 permeability_coefficient = 0.9 - protective_temperature = 400 - heat_transfer_coefficient = 0.70 /obj/item/clothing/gloves/orange name = "orange gloves" diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 480f9e3a80b..01d0b607f68 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -186,7 +186,7 @@ if("Medical Doctor") return list(access_medical, access_morgue, access_surgery) if("Botanist") // -- TLE - return list(access_hydroponics) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT + return list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. if("Librarian") // -- TLE return list(access_library) if("Lawyer") //Muskets 160910 diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 1a6fb874c1f..d911466d155 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -24,12 +24,11 @@ ..() bullet_act(var/obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables. if(istype(Proj ,/obj/item/projectile/energy/floramut)) - src.mutmod = 2 + if(src.planted) + src.mutate() else if(istype(Proj ,/obj/item/projectile/energy/florayield)) - src.yieldmod = 2 - if(src.myseed.yield == 0) + if(src.planted && src.myseed.yield < 2) src.myseed.yield += 1 - return obj/machinery/hydroponics/process() diff --git a/html/changelog.html b/html/changelog.html index a7a1adb15f7..22b2fd2ad15 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -46,6 +46,15 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +