Commit Graph

135 Commits

Author SHA1 Message Date
AsV9
d338cac150 Merge remote-tracking branch 'tgstation/master'
Not sure if this worked. Used a wonky special snowflake strat to merge.
2018-03-24 08:57:13 +01:00
kevinz000
8ebc63d2f2 Randomized Station Time + Night Shifts 2018-02-20 21:59:44 -08:00
Jordan Brown
d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05: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
Jordan Brown
f98a4e66cd Merge pull request #34755 from ChuckTheSheep/Current-Color-as-Default-Color-in-Inputs
All color inputs use current color as default choice
2018-01-24 19:13:58 -05:00
vuonojenmustaturska
6406896df1 Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)
* It works, but is it worth it?

* bitfield helpers take 1

* Would this work?

* remove dangling debug code

* rebase & fixes

* vv bitfield stuff, reading

* DNM oceans of shitcode DNM

* honk

* honk2

* plonk

* rebase & fix
2018-01-22 20:19:46 +01:00
ChuckTheJittai
02033f1756 All color inputs use current color as default choice
Went through all the color inputs and made the "default" argument the current color of what is being selected.
2018-01-21 13:07:35 -05:00
oranges
c8ad5a6314 Clean up a bunch of undefined arg runtimes (#34105)
* Clean up a bunch of undefined arg runtimes

Ensure subtypes have the appropriate arguments, do a bit of code cleanup
and remove some uneeded emote procs that also caused runtimes

* Fix up all calls to canUseTopic, add the dexterity flag

* Runtime with missing force argument in borg unbuckle mob
2018-01-07 21:52:56 -05:00
Tad Hardesty
f2dbe5cf13 Replace explicit z-level checks with defines (#33829)
* Replace explicit z-level checks with defines

* Rename turf_z_is_planet for consistency

* Use TRUE/FALSE in onSyndieBase
2017-12-29 14:40:06 -05:00
kevinz000
00966e2aaa NTnet refactor, assimilates exonet 2017-11-21 20:50:45 -08:00
ShizCalev
8eafaccc88 Cleans up unused code 2017-11-20 00:03:33 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
ShizCalev
c3981ff578 [WIP] Floyd's wild sound adventure (Adds sound_loop datums to a bunch of machinery) (#32336)
* noisy

* Adds sounds to modular computers

* Adds range modifier var to sound loops

* finetunes computer sound range

* maybe fixes stuff

* changes some of the sound lengths

* borgs and some small changes

* sanity

* gravgen makes noise too
 (reverted from commit ea523084c2)
2017-11-13 14:20:34 -05:00
Jordan Brown
2d04e1172d Merge pull request #32641 from praisenarsie/patch-8
blah blah adds some initialize() for squeaky clean code and performance
2017-11-13 12:37:22 -05:00
Qustinnus
ea523084c2 [WIP] Floyd's wild sound adventure (Adds sound_loop datums to a bunch of machinery) (#32336)
* noisy

* Adds sounds to modular computers

* Adds range modifier var to sound loops

* finetunes computer sound range

* maybe fixes stuff

* changes some of the sound lengths

* borgs and some small changes

* sanity

* gravgen makes noise too
2017-11-13 22:10:43 +13:00
Jalleo
2f9537c7a9 Refactor of base machinery a tiny bit more. DONE (#32546)
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
2017-11-12 14:19:04 -05:00
FrozenGuy5
5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00:00
FrozenGuy5
de0d93467e Adds alot of initialize() in lots of files 2017-11-11 20:58:15 +00:00
Tad Hardesty
95e590117a Hide already-downloaded programs from NTNet downloader (#32396) 2017-11-04 19:01:17 -04:00
Emmett Gaines
825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00
Jordan Brown
ff36d32c2e Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers
ID ejecting from computers by alt-clicking
2017-10-14 19:47:52 -04:00
kingofkosmos
c3d20c6d8e Adds few comments so other people won't be as confused as I was.
Adds examine-messages for alt-clicking.
Added sounds for all the computers when inserting/ejecting IDs.
2017-10-13 23:18:14 +03:00
Tad Hardesty
c1794bb402 Fix many instances of "the the"
All uses of "the [src]" have been fixed, as well as other bad string
interpolation directly adjacent to such uses.

In addition to its message, the circumstances under which the tracking
implant locator fails have been updated to use the correct define,
malfunctioning on CentCom rather than on the station.
2017-10-11 21:55:44 -07:00
Tad Hardesty
13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
Jordan Brown
b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
KorPhaeron
72389743db ismachinery define 2017-10-03 18:13:21 -05:00
nicbn
6fb896e4c3 Paper markdown (#30873)
* why it doesn't work

* list thing

* oops

* fixes list. maybe

* Less regex

* wip

* Done I think. I think

* return your functions

* Replace $10 by $a
2017-09-30 09:08:25 -04:00
kingofkosmos
086d636b17 Alt-clicking descriptions when examining (#30988)
* Adds what alt-clicking does into examine-messages.

* whoops fix

* AI holopad examine remove

* Fixed cigarette pack alt-clicking.

* Spear alt-click-message set to show only if explosive lance.
2017-09-29 15:51:31 +13:00
Jordan Brown
4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
Jordan Brown
464e92d335 Minor tweaks to an if (#30683)
* Minor tweaks to an if

* Whoops
2017-09-18 10:45:34 +12:00
KorPhaeron
df826f5d8d Fixes SM monitor (#30640)
* Fixes SM monitor

* (
2017-09-13 02:47:42 -04:00
KorPhaeron
b5071a14d1 And now we have extra parenthesis 2017-09-11 13:23:38 -05:00
KorPhaeron
7ee271752e Missed some parentheses 2017-09-11 13:18:30 -05:00
KorPhaeron
10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
ShizCalev
153e750be7 Allows atmos techs to download the SM monitor (#30458) 2017-09-06 20:59:22 -05:00
shizcalev
2427f217f7 Standardized power displays 2017-08-28 14:22:05 -04:00
Cyberboss
1b2a38c043 Merge pull request #30004 2017-08-19 19:40:27 -04:00
Jordan Brown
728aefbd70 Adds DropLocation(). To generally be preferred to get_turf() (#29814)
Fixes #29802

Unlike get_turf()this will sensibly pick if loc can be safely used
2017-08-18 16:44:20 +12:00
shizcalev
75dc5d8272 Moved emagged var to item parent. 2017-08-17 22:15:11 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk
371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
MrStonedOne
d7a507d412 Clean up some inputs 2017-08-13 22:29:58 -07:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
JStheguy
c1e1662c86 gives laptops actual sm monitoring sprites (#29712)
🆑 JStheguy
imageadd: Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one.
/🆑

It still counts as a sprite change if the code changes were only in service to the sprite change, right?
2017-08-08 22:49:04 +12:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
JStheguy
1f9c7de8f6 Tablet resprite (#29427)
* resprites tablets

also colors

* removes accidentally added tablet desc

maybe some other time
2017-07-22 20:53:49 +02:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00