Commit Graph

806 Commits

Author SHA1 Message Date
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
Grandmother of 50
0e67143c2d Update gene_modder.dm 2018-06-20 16:46:00 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
ninjanomnom
d483ff3ef0 Regexes
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
2018-06-13 19:19:23 -04:00
Jordan Brown
3dcf793cc7 Merge pull request #38422 from DaxDupont/hydroponics
[s] Fixes exploit where botany trays can be refilled at no cost.
2018-06-12 11:45:15 -04:00
Dax Dupont
4102790da6 [s] Fixes exploit where botany trays can be refilled at no cost. 2018-06-11 19:15:31 +02:00
ShizCalev
3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
deathride58
c5a0e14acb Tones down values for a lot of different hotspot_expose calls (#38232)
* Tones down values for a lot of different hotspot_expose calls

* Update LINDA_fire.dm (#38217)

* Automatic changelog compile, [ci skip]

* Slight changes to camera network code (#38223)

* Removes a useless var and corrects two cameras to use the automatic naming system to reduce dv usage.

* Damn github didnt notice this was here....

* Fixes datediff not returning (#38215)

* Fixes pocket items being deleted when monkeyizing (#38220)

* Automatic changelog generation for PR #38220 [ci skip]

* readds atmos heating from hotspot_expose(), as requested by naksu

* Tones down hotspot_expose values for sparks moving and destroying

* tones down item heat by a lot. no more burning your face off after smoking a cigarette
2018-06-08 15:53:10 +03:00
Jordan Brown
6d0179f57b Merge pull request #38116 from AutomaticFrenzy/patch/anchored
Refactor machinery to default to being anchored
2018-06-01 12:27:38 -04:00
vuonojenmustaturska
c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
ShizCalev
c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
vuonojenmustaturska
d335a0fd05 Make typecache checks twice as fast, stop using single-type typecaches where appropriate (#38075) 2018-05-28 16:31:30 -07:00
Tlaltecuhtli
37874891f8 fixes beebox from cargo starting wrenched
#38119
2018-05-28 06:58:02 +02:00
Tad Hardesty
2f212e16a3 Remove redundant anchored=TRUE from machines 2018-05-27 19:23:37 -07:00
Tad Hardesty
ebd72e5805 Fix construction behavior of hydroponics trays 2018-05-19 23:51:42 -07:00
Dax Dupont
a2578b81ab Adds swapping disks to the plantmanipulator (#37765) 2018-05-13 14:51:53 -07:00
YPOQ
6327b79db6 New stacks now auto-split if amount > max_amount 2018-05-09 13:53:47 -06:00
YPOQ
2b141c3e39 Fixes new stacks getting merged before the stack size is set 2018-05-08 22:20:56 -06:00
Xhuis
6c6ca28ed2 not allowed to use quirks unless you code them 2018-05-03 12:29:10 -04:00
Jordan Brown
32f2f07e4d Merge pull request #37513 from ShizCalev/pineapple-memes
Adds traits for a character's preference towards pineapples.
2018-04-30 14:02:59 -04:00
vuonojenmustaturska
98f8ca7553 Moves several clothing-specific flags from /atom to their proper type (#37486)
* lavaproof

* more flags

* it compiles

* Remove a couple of lists
2018-04-28 13:22:28 -05:00
ShizCalev
e6ef83f059 Adds pineapple traits 2018-04-28 02:55:59 -04:00
oranges
ecd0d8b538 Merge pull request #37476 from AnturK/thisalwaysbuggedme
Uppercases slot defines.
2018-04-28 13:13:56 +12:00
Dax Dupont
52a7ebcbff Refactors and fixes RPEDs (#37380)
* Refactors and fixes RPEDs

* Fixes storage related memes

* beams should probably always play
2018-04-27 21:12:41 +03:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Fox McCloud
057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
vuonojenmustaturska
9873464003 It started in a tavern on the edge of Macke town (#37362) 2018-04-23 14:34:58 +02:00
SailorDave
abe15054ad [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-21 16:00:25 +03:00
Tad Hardesty
6df32bc38b Correct some pixel_z issues 2018-04-14 20:21:37 -07:00
kevinz000
ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
Armhulen
c45a98e559 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-04 11:11:31 +12:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Ian Turk
fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
Armhulen
84d4b3aae6 Mushroom people, revived! (#35858)
* caps fixed, small other fixes and mushpunch

* honey, i fixed the bugs!

* STUPID YORII DUMB GIRL STINK LEAVE

* boolean is such a fun word

* zoinks

* F_XED

* fixes part 2

* TRUEs and FALSEs

* don't drink and code boys unless you're goofball or like maybe kor

* for entirely different reasons i mean

* at what point is goofball too drunk to troll but not drunk enough to shitcode

* cool your jets, travis.

* what a TRAVIS-TY

* mush added to yet another blacklist!
2018-03-07 21:34:56 -06:00
Ashe Higgs
5c8d845f56 [s] Improves and secures trait assignment code, allows their pref to be changed midround, tweaks RDS and Night Vision (#36160)
* Traits but less buggy

* no tick while dead

* fix security vuln
2018-03-06 15:57:42 +02:00
XDTM
b49798c483 Converts several species traits into generic traits (#35743)
* Converts several species traits into generic traits

* 2hot
2018-02-26 10:47:58 +13:00
Ashe Higgs
7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-26 09:50:16 +13:00
XDTM
2ac902ab3c Refactors anti-magic into a component (#35639)
* Refactors anti-magic into a component

* plenty o stuff, mainly holy and antimagic traits

* fix

* fix2

* moved to components, moved some of the logic to the component

* don't blame me if the code looks copypastey

* right
2018-02-26 09:45:12 +13:00
BordListian
6da8820fee Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)
* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one
2018-02-23 21:34:53 +02:00
vuonojenmustaturska
c11452d6f8 Remove poisoned apple 2018-02-19 15:51:55 +02:00
vuonojenmustaturska
9e3ee33079 Merge pull request #35703 from DaedalusGame/ok-sure-why-not
Fixes powercell injecting attaching the wrong value to rigged
2018-02-16 13:09:01 +02:00
oranges
5031ac3faf Merge pull request #35606 from coiax/hydroponic-foods-taste
Apples now taste like apples
2018-02-16 09:52:24 +13:00
BordListian
27d63d13a9 - Fixes powercells attaching the reagent datum for plasma to their rigged var what the hell 2018-02-15 20:34:40 +01:00
Jack Edge
ae03860b8c Apples now taste like apples
🆑 coiax
add: Centcom now reports that thanks to extensive bioengineering, apples
and oranges now taste of apples and oranges, rather than nothing as they
did before.
/🆑

Basically, my hack to give hydroponic grown things flavour when I
finished my taste PR never worked, and since I've started being a chef
of recent, this has been bugging me.

I think I changed some descriptions of some foods a bit.
2018-02-12 22:55:26 +00:00
ACCount12
f43fcbd1d6 Replaces istype checks for mining tools with tool_behavior checks 2018-02-13 00:09:50 +03:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
Dax Dupont
4b75dd8b50 Hatchets are now small instead of tiny. 2018-02-09 14:22:24 -06:00
ACCount
100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095)
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
2018-02-06 11:02:53 +01:00
Ashe Higgs
5d999571a1 Adds pineapples to botany, and Hawaiian pizza (#35205)
* Adds pineapples.
2018-02-02 19:35:31 +02:00
Jordan Brown
9e0eaa3b00 Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong
Tomatoes and other foods found to have girl parts; removed from vegetable piles
2018-01-31 10:10:31 -05:00