Commit Graph

81 Commits

Author SHA1 Message Date
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
91ffa11bc9 Nerfs circuit pneumatic cannons and guns with extra sanity checks. 2019-12-04 01:07:36 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
deathride58
ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 2019-08-21 22:16:44 -04:00
CalamaBanana
fc5b617ca0 Input-check for the color 2019-05-25 21:18:17 +02:00
CalamaBanana
d9cc539948 Removed color whitelist 2019-05-24 17:46:48 +02:00
CalamaBanana
1e7b537166 Update code/modules/integrated_electronics/core/detailer.dm
Prettier list

Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
2019-05-16 00:42:05 +02:00
CalamaBanana
9e00562e68 Added custom option
Added custom option to the color selection
2019-05-15 13:13:17 +02:00
CalamaBanana
7cd74e6601 Adds pink to the circuit coloring tool 2019-05-15 00:07:53 +02:00
Useroth
b80bb21219 Dildo-shaped circuit assemblies. Because that's what the community needs. 2019-05-09 08:45:47 +02:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -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
Jordan Brown
3bee10c653 Merge pull request #38456 from theo2003/circuit_scan
Players who edited a circuit assembly can scan it as a ghost.
2018-06-16 06:18:46 -05:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
d3c7dd3802 Fix recycling the same assembly multiple times (#38275) 2018-06-05 04:13:44 -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
Jordan Brown
b7fd3a37e2 Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1
Fixes an oops in circuit printer description check
2018-05-21 16:43:42 -05:00
r-esistor
63e472050c Circuit Labels (sorta understanding git edition) (#37633)
* Customizable circuit names/descriptions

* Circuit descriptions are now copied

* Prevents code injection through the desc
2018-05-21 02:11:50 -05:00
Trevor Serpas
61e1529e18 Circuit gun inhands and grabber fix (#37836)
* Grabbers update when a thrower uses its inventory and throwers and gun circuits need to use the gun assembly

* visible_messages
2018-05-17 10:27:25 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Nich
c9702d2a5c you can now print tools using the integrated circuit printer again (#37445)
* you can now print tools again

* I'm severely mentally retarded

* Update printer.dm
2018-04-27 05:17:42 -05:00
Nich
2a40af1bf2 Fixes a thing (#37427) 2018-04-25 13:29:13 -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
John Ginnane
e67467b919 Reorganised component controls (#37054)
* Reorganised component controls

* Simplied menu further

Removed "rename" and "copy ref", renamed "remove" to just "-"

* Added similar changes to "built in" components and added "Rename"
2018-04-15 04:31:16 -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
robbym
1e34269e0c Fixes 0 value not being saved in constant memory circuits (#36867)
* Fixes 0 value not being saved in constant memory circuits

* Fixes 0 value not being loaded in constant memory circuits

* Switched to isnull proc for null checks
2018-04-03 22:03:12 -05:00
vuonojenmustaturska
7020c19dff Merge pull request #36736 from fludd12/light-up-the-night
Assemblies with lighting circuits now properly update light position.
2018-03-28 12:16:56 -05:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
CitadelStationBot
fd63838558 [MIRROR] Circuits constants chips now keep their data on save/load (#6012)
* Circuits constants chips now keep their data on save/load

* Fixes constants chips (#36315)
2018-03-19 21:08:24 -05:00
Ashe Higgs
ceea41b5fe Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns (#36255)
* Fixes slowcloning breaking with nonints

* Refactors to use timestamps and not seconds
2018-03-10 14:37:36 -06:00
CitadelStationBot
59d61d5e0d [MIRROR] [READY]Circuit balance (#5760)
* [READY]Circuit balance

* [READY]Circuit balance (#35931)

* cooldowns, power cell,disks

* NUMBERS NUMBERS NUMBERS

* 1 8 9

* PR PR PR

* DESC DESCDSCDCC

* <br>

* GET ALL CONTENTS

* Update power.dm

* Update power.dm

* Update time.dm
2018-03-02 20:05:28 -06:00
Ashe Higgs
063fc1a7af Circuit cloning balance: Timed cloning, reduced upgrade disk material cost (#35657)
* Printing compromise

* Adds fast cloning to the upgraded printer

* sorry this took so long
2018-02-25 14:47:06 -06:00
deathride58
79db3ba93d Merge pull request #5607 from Citadel-Station-13/upstream-merge-35578
[MIRROR] Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks
2018-02-20 15:24:26 +00:00
Ashe Higgs
1fe801e155 Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks (#35578)
* Some more circuitry foolin'

* Fixes blood draw not working
2018-02-19 22:09:01 -06:00