cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Generalizes the chemical blacklist, refactors some other chemical lists and cleans up some related code (#21810)

Browse Source 
* almost done

* HELP, SCOPE KEEPS INCREASING

* if this isn't the last thing, blame my sleepy me

* fucking foam all my homies hate foam

* remove the extra whitespace

* ghhh this needs testing + revert old shit

* first sleeper steps

* okay now to revert some changes

* oops forgot this

* more fixes

* iv bags can't dupe shit anymore too

* removes coniine from the list because why not

* removes life and histamine

* this should pass Cl

* stop runtiming me for unexisting chemicals

* adds ???? instead + god I hope this passes Cl

* attempt #2 to fix Cl

* Cl still fails but no solution now - static lists

* One fucking day Cl will not fail + complete remove

* I am going insane

* I am praying to several gods

* I'm getting desparate

* whoops that's my bad

* whoopsie number 2

* oops space indentation

* one rubber ducky later

* attempt number I am in a psych ward

* CODING CHAT MY BELOVED

* last things

* foam is also not a chemical

* now it shouldn't remake the list every time

* Henri review

* Adds saturated activated charcoal

* Charlie review
This commit is contained in:
DGamerL
2023-09-13 11:42:17 +02:00
committed by GitHub
parent cf381b1300
commit 3de8e63c6c
20 changed files with 90 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/beekeeping/beebox.dm
+11 -16
View File
@@ -93,13 +93,12 @@
/obj/structure/beebox/process()
if(queen_bee)
if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST)
if(honeycombs.len < get_max_honeycomb())
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
var/obj/item/reagent_containers/food/snacks/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
honeycombs += HC
if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST && honeycombs.len < get_max_honeycomb())
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
var/obj/item/reagent_containers/food/snacks/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
honeycombs += HC
if(bees.len < get_max_bees())
var/freebee = FALSE //a freebee, geddit?, hahaha HAHAHAHA
@@ -166,16 +165,12 @@
return
var/obj/item/queen_bee/qb = I
if(!qb.queen.beegent || (qb.queen.beegent && qb.queen.beegent.can_synth))
if(!user.unEquip(qb))
return
qb.queen.forceMove(src)
bees += qb.queen
queen_bee = qb.queen
qb.queen = null
else
visible_message("<span class='notice'>[qb] refuses to settle down. Maybe it's something to do with its reagent?</span>")
if(!user.unEquip(qb))
return
qb.queen.forceMove(src)
bees += qb.queen
queen_bee = qb.queen
qb.queen = null
if(queen_bee)
visible_message("<span class='notice'>[user] sets [qb] down inside the apiary, making it [qb.p_their()] new home.</span>")