Commit Graph

25102 Commits

Author SHA1 Message Date
Jordan Brown
0a28a839cf Merge pull request #37364 from Jalleo/Inducer_change
Removes the ability for inducers and circuits to charge energy weapons.
2018-04-23 09:49:03 -04: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
KorPhaeron
4fada77813 Changeling vs Changeling (#37332)
* Changeling vs Changeling

* Properly count purchased powers

* No advanced cloner exploits

* Or not and
2018-04-22 20:48:25 -04:00
KorPhaeron
ad809a0e5b Makes engine goggle numbers more visible (#37324) 2018-04-22 20:21:14 -04:00
KorPhaeron
7ccaed0bcd Can't push CTF flag carriers (#37321) 2018-04-22 20:20:53 -04:00
AnturK
e72dee006a Fixes pAI's breaking drone static. (#37320) 2018-04-22 20:20:24 -04:00
iksyp
28e98a4d40 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315)
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
2018-04-22 20:20:06 -04:00
AnturK
ec40cb1e71 Mapping component helper (#37314)
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
2018-04-22 20:18:59 -04:00
Dax Dupont
7e11ec6bbe Improves fuel tank explosion logging 2018-04-22 17:29:23 +02:00
blah
0042b12379 What I get for commiting without doing a build check first 2018-04-22 14:09:09 +01:00
blah
97b52ed3d7 Fixes a power creep that occurred with two objects that weren't realised by the project lead/owner and needs reverting. 2018-04-22 14:02:27 +01:00
ninjanomnom
03f0c4ff01 Adds a selection chat notification 2018-04-22 07:29:24 -04:00
ninjanomnom
551f6d7cb4 Adds a picker tool to advanced buildmode 2018-04-22 07:22:39 -04:00
ninjanomnom
176d76ff90 Makes it possible to see tiles past z transitions 2018-04-21 16:46:12 -04:00
Emmett Gaines
b932655c78 Flatten the map transition edges (#37301) 2018-04-21 23:42:49 +03:00
AnturK
c4900e785d Fixes buildmode trying to build in nullspace. 2018-04-21 11:10:39 -05: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
imsxz
c2a279ee2b fixes the laws of matter conservation (#37300) 2018-04-20 16:31:28 -04:00
ShizCalev
8e33113cfe Cleans up conveyor belts (#37288)
* Cleans up conveyor belts

* Fixes

* rip that idea. this fixed it anyway at least
2018-04-20 02:52:14 -04:00
Dax Dupont
d923358390 Fixes cat parts not showing up in perfs. (#37202)
* Fixes cat parts not showing up in perfs.

* electric boogaloo

* this works
2018-04-19 18:40:52 -04:00
pigeons
6135ec864f Refactors bitflag macro values into bitshifts (#37234)
* Refactors bitflag values into bitshifts

* minor formatting edits

* Unbitshifts a macro set that skipped 3 for whatever reason
2018-04-19 18:36:35 -04:00
oranges
084f4687d3 Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks
Fix cycle-linked airlocks on shuttles
2018-04-19 20:14:46 +12:00
kachnov
88b1e1b8a0 Fixes Kudzu growing in space (#36701)
* initial commit

* adds a macro

* a small change

* Update spacevine.dm
2018-04-19 10:13:28 +02:00
Jordie
97ac3892a1 removes href log from admin investigate 2018-04-18 15:45:52 -05:00
ShizCalev
d77eb3df50 Adds new window spawners 2018-04-18 13:50:59 -05:00
Jordan Brown
6b50baa720 Merge pull request #37268 from ShizCalev/scp-ruin-fix
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-18 12:33:45 -04:00
vuonojenmustaturska
0e2ee4f5b6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
2018-04-18 16:32:35 +02:00
ShizCalev
0c5bfbeb0a faction check proc instead 2018-04-17 11:01:53 -04:00
ShizCalev
29e927d902 Fixes SCP ruin turret faction 2018-04-17 10:41:43 -04:00
Jordie0608
b304c760ae adds log and management tabs to permissions panel 2018-04-17 21:26:24 +10:00
Tad Hardesty
23b238e39a Fix cycle-linked airlocks on shuttles 2018-04-16 18:24:48 -07:00
MrDoomBringer
5851de5d2f fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
2018-04-16 20:13:43 -04:00
Jordan Brown
2477c597e7 Merge pull request #37229 from vuonojenmustaturska/centcommission
Add team objective support to the centcom antag datum
2018-04-16 17:17:28 -04:00
Dax Dupont
47de11d966 Readds shortcut for the current round logs. (#37245)
* Removes antag huds and show tickets verb

* Readds shortcut to get to the current round log files

* Make a seperate proc
2018-04-16 15:44:20 +03:00
vuonojenmustaturska
26fff381b5 Merge pull request #37214 from AnturK/imighthavebraindamage
Fixes adjusting brain damage.
2018-04-16 15:39:00 +03:00
vuonojenmustaturska
59ed55a02f Merge pull request #37209 from ninjanomnom/admin-shuttles
Makes admin loaded shuttles work again
2018-04-16 15:38:42 +03:00
vuonojenmustaturska
e9529e4cfd Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 05:35:35 -04:00
pigeons
3b5219a58d Parenthesizes some macros (#37212)
* parenthesizes some macros

* A couple more macro definition parenthesizing
2018-04-16 02:47:23 -06:00
Tad Hardesty
4a8c989d74 Fix grammar in lightbulb shatter message (#37207) 2018-04-15 23:43:25 -04:00
Jordan Brown
b07f13d656 Merge pull request #37201 from kevinz000/patch-483
Adds missing arguments to eye insert procs
2018-04-15 23:24:50 -04:00
Jordan Brown
7262a3e5cb Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z
Correct some pixel_z issues
2018-04-15 23:22:38 -04:00
vuonojenmustaturska
1c743d5459 Merge pull request #37233 from KorPhaeron/gps3
Fixes BSA targetting offline GPS
2018-04-16 00:00:58 +03:00
KorPhaeron
d76dfa76d8 Fixes BSA targetting offline GPS 2018-04-15 12:48:32 -05:00
vuonojenmustaturska
95e916b9d0 blacklist his grace from being deep-fried 2018-04-15 12:40:13 -05:00
vuonojenmustaturska
41e3151427 Allows passive gates to be touched in unpowered areas 2018-04-15 12:39:36 -05:00
vuonojenmustaturska
d69d7699d7 fixes borgs being able to send the ferry 2018-04-15 12:38:49 -05:00
vuonojenmustaturska
e13da06595 unconscious check 2018-04-15 12:38:18 -05:00
vuonojenmustaturska
c0bad9fd32 Couple of cryo fixes 2018-04-15 12:38:18 -05:00
vuonojenmustaturska
afb870e33c Fixes bluespace cookie centcom exploit 2018-04-15 12:37:42 -05:00