Commit Graph

87 Commits

Author SHA1 Message Date
The0bserver
96c6608d59 enabled plumbing on trays. 2020-10-08 22:50:24 -04:00
yorii
42db9371de fixes rounding error in growthstages 2020-10-04 03:47:01 +02:00
silicons
1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
The0bserver
7c695409d0 Okay, we went back in time. Maybe this will work? 2020-10-01 06:40:09 -04:00
silicons
532381c280 Update hydroponics.dm 2020-09-27 13:57:57 -07:00
The0bserver
47ff98e4c5 Adds examine text, removes old self sustain checks 2020-09-25 18:12:26 -04:00
The0bserver
5f5279d2ff You wish for change... (Added instabilities.) 2020-09-02 03:15:03 -04:00
The0bserver
457cb5e238 THIS IS IT LUIGI! ALL REAGENTS SET! 2020-09-01 06:44:46 -04:00
The0bserver
e36f93baeb Sorry, Circuits. (Only slightly.) 2020-09-01 02:42:43 -04:00
The0bserver
89b837461e This should squash the error. 2020-09-01 02:32:28 -04:00
The0bserver
2c6cfd2115 YOU CAN'T STOP ME FROM DREAMING! 2020-09-01 02:19:37 -04:00
The0bserver
df3c2d3d8d Reduced some bloat, using TRAY_NAME_UPDATE 2020-08-31 05:01:51 -04:00
The0bserver
dbb6ef7d4e I think we got rid of nutrilevel, finally. 2020-08-31 03:26:43 -04:00
The0bserver
4edf61dde7 New Define File: Botany.dm Earthmother save me. 2020-08-31 00:34:45 -04:00
The0bserver
c2002aca78 This is it, Luigi. We gotta move the function! 2020-08-30 12:44:12 -04:00
The0bserver
af97bddf87 It begins. Earthmother preserve me. 2020-08-30 11:38:46 -04:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
lolman360
6b23138b31 l 2020-07-22 22:20:42 +10:00
lolman360
c07e5d544b wweeee 2020-07-22 11:27:26 +10:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Kraseo
170e092a24 this is going to end well 2020-02-25 13:14:18 +01:00
Ghom
536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
Hatterhat
590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
Hatterhat
9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06:00
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghom
a33065a728 Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
2019-12-21 18:34:35 +01:00
Trilbyspaceclone
9a2311b72b grammar 2019-12-15 02:42:17 -05:00
TrilbySpaceClone
c5cac186fc bad notes bgone 2019-12-15 01:50:57 -05:00
Sishen
f6a64b31b7 b 2019-12-06 07:02:57 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Useroth
2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBot
d06df512d0 [MIRROR] [s] Fixes exploit where botany trays can be refilled at no cost. (#7081)
* [s] Fixes exploit where botany trays can be refilled at no cost.

* Merge pull request #38422 from DaxDupont/hydroponics

[s] Fixes exploit where botany trays can be refilled at no cost.
2018-06-13 20:25:08 -07:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-11 22:29:27 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
oranges
3fd74027c1 Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays
Fix construction behavior of hydroponics trays
2018-05-21 16:58:31 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
LetterJay
7f90eaf89c Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270
[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits
2018-04-22 22:19:28 -05:00
SailorDave
187fb97388 [READY] A few additions, tweaks, and fixes for integrated circuits (#36270)
* A few additions, tweaks, and fixes for integrated circuits, and some very minor tweaks to hydroponics and carbon/silicon examine() to support those changes.

🆑 SailorDave
rscadd: A new manipulation circuit, the Seed Extractor. Extracts seeds from produce, and outputs a list of the extracted seeds.
rscadd: A new list circuit, the List Filter. Searches through a list for anything matching the desired element and outputs two lists: one containing just the matches, and the other with matches filtered out.
rscadd: A new list circuit, the Set circuit. Removes duplicate entries from a list.
tweak: The Plant Manipulation circuit can now plant seeds, and outputs a list of harvested plants.
tweak: Reagent circuits can now irrigate connected hydroponic trays and inject blood samples into Replica pods.
tweak: The Examiner circuit outputs worn items and other examined details of carbon and silicon mobs into the description pin.
tweak: List Advanced Locator circuit now accepts refs as well as strings.
bugfix: Fixed the Power Transmitter circuit not properly displaying a message when activated.
bugfix: Medical Analyzer circuit can now properly scan non-human mobs.
/🆑

Additional details:
- Plant Manipulation: obj/item/seeds harvest() proc and obj/machinery/hydroponics attack_hand() procs were adjusted slightly to allow this, returning a list when harvested.

- Seed Extractor Module: obj/machinery/seed_extractor /proc/seedify() was adjusted to return a list of seeds.

- Hydroponics replica pod was adjusted to be injectable|drawable, and use reagents and on_reagent_change() rather than a hardcoded attackby(), so other injection methods can use it to allow blood sampling/future reagent reactions regardless of type.

- IC Examiner Module returns a list of examine() messages from mob/living/carbon, mob/living/carbon/human, mob/living/carbon/silicon, and mob/living/carbon/silicon/ai in the description data pin, rather than outputting null since they had an empty desc var. The relevant examine procs were adjusted to return their messages.

 - IC get_data() and set_pin_data() adjusted to return text/num properly and to WEAKREF/un-WEAKREF the contents of passed lists.

* fixes errors from screwy merge conflicts and replaces illegal proc name

* re-added a traits tag that accidentally got removed

* review changes

* plant analyzer outputs irrigation status and connected trays, search circuit uses 2 Cx down from 6

* examiner outputs the occupied turf of the examined object and can also scan turfs

* string inputs on circuit pins now use multiline input; fixed edit/remove not working on list pins; fixed large screens not outputting visible messages when held

* locomotion now has a cooldown of 0.1sec and their complexity + pathfinder complexity reduced

* assemblies can open doors they have access to from a card reader through collision

* Merge master branch; fixes pathfinder AStar runtime; fixes tile pointer; fixes material manager self-ref; various grammar touchups

* review changes

* fixes improper weakref type checking

* fixes seed extractor merge confict, removes unnecessary weakref change

* dang ol merge undoing my changes HECK

* updated to robbym's tile pointer PR with clearer var names

* added missing "not scanned" results to tile analyzer, removes duplicate circuit entries(???? how)
2018-04-22 02:31:10 -05:00
Jordan Brown
de896c2929 Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z
Correct some pixel_z issues
2018-04-15 22:23:58 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot
9b4770f855 [MIRROR] Mining tools now use tool system (#5462)
* Mining tools now use tool system

* Update hydroponics.dm
2018-02-14 05:36:15 -06:00