Commit Graph

128 Commits

Author SHA1 Message Date
nik707
2307f7a2a6 Merge pull request #9146 from Raptorizer/Botany-Peaches
New plant type: Peaches
2019-08-29 19:59:37 -05:00
Winter Flare
26c5aa6185 Update berries.dm
Actually fixes strawberries so they have visible growth stages and death icons.
2019-08-27 03:47:56 -04:00
lolman360
323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213
Patch 213
2019-08-19 11:12:50 +10:00
Trilbyspaceclone
8214a7012f I Didnt save the two corrections 2019-08-18 01:17:34 -04:00
Trilbyspaceclone
fc6633071a rwar! 2019-08-18 01:07:38 -04:00
TrilbySpaceClone
4dae36869c tada 2019-08-18 01:01:00 -04:00
Trilbyspaceclone
43b1d0405e Update flowers.dm 2019-08-17 23:25:38 -04:00
Trilbyspaceclone
bb9aa4f039 I woulder how much this will fuck everthing up 2019-08-17 22:49:06 -04:00
Trilbyspaceclone
cfd8217947 Update flowers.dm 2019-08-17 22:10:23 -04:00
Raptorizer
ff58fec243 New plant type: Peaches
Botanists can now grow peaches from a new pack of seeds!
2019-08-17 02:50:56 -05:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master
3
2019-08-17 11:55:56 +10:00
kevinz000
c2dd7111d0 Merge pull request #9112 from Trilbyspaceclone/patch-209
Heyyyy lets make sure the strawberry seeds are in the vender and spelled correctly
2019-08-16 17:17:04 -07:00
Trilbyspaceclone
d30df526f7 Update berries.dm 2019-08-11 19:05:36 -04:00
lolman360
da61b66f5c ban me? 2019-08-11 11:11:30 +10:00
Cebutris
d77360c794 gives tea aspera proper reagents 2019-08-10 19:32:12 -04:00
TrilbySpaceClone
ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04:00
Ghommie
3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Ghommie
1323ace579 Peanuts, peanut butter, and sandwiches. 2019-06-17 05:17:24 +02:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58
8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
kevinz000
302f8f00f4 Update tomato.dm 2019-01-04 00:42:29 -08:00
kevinz000
20553efea5 Update tomato.dm 2018-11-28 19:52:01 -08:00
kevinz000
611bdad58e Update tomato.dm 2018-11-20 10:57:56 -08:00
kevinz000
0872780f81 Update tomato.dm 2018-11-20 01:18:06 -08:00
Poojawa
c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b97ed1d248 Merge pull request #7340 from Citadel-Station-13/upstream-merge-38908
[MIRROR] Adds a sprite for Glowcaps.
2018-07-06 01:34:50 -04:00
jegub
0180039518 Adds a sprite for Glowcaps. (#38908) 2018-07-05 13:40:46 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58
792943f683 Merge pull request #7034 from Trilbyspaceclone/patch-1
Adds in Oxygen to grass
2018-06-26 14:02:39 -04:00
Trilbyspaceclone
49f1e9ae71 Update grass_carpet.dm 2018-06-09 03:05:49 -04:00
Trilbyspaceclone
0e08cfad89 Update grass_carpet.dm 2018-06-07 15:26:13 -04:00
Trilbyspaceclone
5ef84b6e4b Adds in Oxygen to grass
Adds in 0.03 Oxygen gene to grass!
Why: Mostly for Life-Bringers to be able to make there own Oxygen. 
Side note: First time touching code if I did a bad make sure to yell at me for it with harsh words of disappointment!
2018-06-07 15:06:10 -04:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
LetterJay
0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
Tad Hardesty
021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
oranges
e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
Jordan Brown
12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes
Adds traits for a character's preference towards pineapples.
2018-04-30 13:02:05 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -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
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
Armhulen
fff22d5409 podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) (#36733)
* yeeeeeeeeeeap

* i turned myself into a commit morty!

* I'M COMMIT RICKKKKKKKK

* tinydwarfy was an inside job

* *reels in pain* you KNOW I DON'T LIKE PISTACHIOS

* WOO
2018-04-03 22:02:17 -05:00
deathride58
1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +00:00