Commit Graph

293 Commits

Author SHA1 Message Date
LetterJay
5bf3bd761d Merge pull request #6961 from Citadel-Station-13/upstream-merge-38175
[MIRROR] Removes drone overlays and the associated code
2018-06-02 07:45:00 -05:00
LetterJay
8d8db8d2fe Merge pull request #6977 from Citadel-Station-13/upstream-merge-38091
[MIRROR] EMPs no longer pulse internal silicon wires
2018-06-02 07:32:11 -05:00
LetterJay
97a31c283b Merge pull request #6963 from Citadel-Station-13/upstream-merge-38158
[MIRROR] Fix: Cyborgs can now use defibs with other modules equipped
2018-06-02 07:23:42 -05:00
kevinz000
308a8f16b7 EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -05:00
Cruix
9c4f4ce17f AI Multicamera mode (#37695)
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -05:00
CitrusGender
f4441c4836 Fix: Cyborgs can now use defibs with other modules equipped (#38158)
* Adds a check to see if the user is a cyborg before referring to the offhand.

* Update twohanded.dm

* actually this is a bit more modular

* Update twohanded.dm

* Update twohanded.dm
2018-05-31 22:41:40 -05:00
vuonojenmustaturska
7b6c75df28 Removes drone overlays and the associated code (#38175)
* Remove drone overlays

4* animated multidir overlays per mob is a bit much

* to the orbit with you too
2018-05-31 22:41:21 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
[MIRROR] Makes more messages pronoun sensitive
2018-05-23 07:46:26 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -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
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
2018-05-14 15:13:33 -05:00
ShizCalev
6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -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
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -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
vuonojenmustaturska
ed201bc65d Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 04:36:40 -05:00
Jordan Brown
78f89423fe Merge pull request #37156 from ExcessiveUseOfCobblestone/patch-38
Stops silicons looping through world every login looking for flippin runes
2018-04-14 21:47:49 -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
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
LetterJay
70264c238b icon state fix 2018-04-01 06:18:26 -05:00
Poojawa
75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05:00
LetterJay
cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJay
002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
CitadelStationBot
9f182d89ed [MIRROR] Distinguishes law types by colour (#6022)
* Distinguishes law types by colour

* merge conflict
2018-03-19 22:17:24 -05:00
CitadelStationBot
df15bbe0f0 [MIRROR] New & Fixed AI VOX Sound Files (#6003)
* New & Fixed AI VOX Sound Files

* Update vox_sounds.dm
2018-03-19 21:15:34 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
astralloop
e8548b392b To go even further byond... the above lighting layer! (#36106)
* This, is my normal form.

* THIS, IS A SUPER SAIYAN ASCENDED.

I CALL IT A SUPER SAIYAN 2

* Update lighting.dm

* Spelling correction (#3)

* Update layers.dm

* Update chunk.dm

* TO GO BYOND....

* Update lighting.dm
2018-03-08 22:43:23 -06:00
Poojawa
013c908ebf Update robot.dm 2018-03-06 23:39:06 -06:00
Poojawa
3c1e557302 compile issues 2018-03-06 22:35:16 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -06:00
Poojawa
61b121a4c9 Dogborg fixes, Borg construction animations! (#5725)
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
2018-03-04 11:53:48 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
[MIRROR] [s] Cameranet fixes
2018-02-23 13:21:23 +00:00
Poojawa
743b1239bb Fixes dogborg offsets and gun layering (#5668)
* Fixes dogborg offsets.

* Fixes Dogborg laser overlays

* comment fix.
2018-02-22 23:48:24 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
Dax Dupont
d368c42a98 Fixes extremely thicc robots (#35722)
* Fixes extremely fat robots

* grasp
2018-02-17 10:13:08 -06:00
LetterJay
14d387fa04 Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542
[MIRROR] Cleans up some duplicate canusetopic warnings
2018-02-15 22:17:54 -06:00
oranges
5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal
Cleans up some duplicate canusetopic warnings
2018-02-15 20:35:03 -06:00
deathride58
e873fce53f Update laws.dm 2018-02-15 20:28:05 -05:00
AnturK
10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00