Commit Graph

92 Commits

Author SHA1 Message Date
Ghommie a74714c2ab Moved these getters toward the upper end. 2020-10-29 16:02:13 +01:00
Ghommie c9f0966156 Non-human mobs can now benefit from held id cards and economy. 2020-10-27 15:59:28 +01:00
Qustinnus eca964db35 Ports soup, snacks, icecream, salads and meat to newfood (#54028)
Ports soup, snacks, icecream, salads and meat to newfood
2020-09-29 20:36:27 -07:00
Timberpoes 1f23cc281d Enforce preserving parent proc return values across ui_act call stacks (#53964)
All ui_act procs should call parent by default. All procs should preserve the value of the parent proc when it's TRUTHY and pass it down the call stack. No UI should be interactible when its flags or state indicate it should not be, except when explicity overriden by child procs intentionally disregarding parent return values to achieve a specific goal.
2020-09-26 11:52:39 -03:00
Aleksej Komarov 0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
EdgeLordExe bf604b00d6 [Merge Ready]Medipen middle ground, direct nerf but more versatile (#51757)
* lavaland changes

* luxury medipens

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* e

* e

* e

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-06-29 13:25:28 -04:00
actioninja b5dfd8880d id to component name 2020-04-19 19:36:35 +03:00
Fikou bac5fd01a5 adds bubblegum gum (#50026)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* adds bubblegum gum

* autodoc

* fixes fuckups

* fixes merge conflict and bad things

* nicer color

* shortens proc name

* Update code/modules/food_and_drinks/food/snacks_other.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* cringe

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-23 14:04:26 -03:00
nightred 15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
Arkatos1 cd2a685ee8 tgui-next: Mining Vendor (#48991)
* Mining Vendor tgui-next

* Formatting

* Revert "Formatting"

This reverts commit 2eb35516b2f755d78341915a4b57b2b8548195eb.
2020-02-07 16:59:10 +01:00
MrPerson 26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
nemvar 58ec03d9a9 Fixes mining vendor edge case (#48780)
* Fixes mining vendor edge case

* I swear, everyone starts acting like an idiot if they have to write a Topic proc.
2020-01-14 20:51:34 -05:00
skoglol 938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
kingofkosmos 259626a8b4 Removes excess spaces in messages. 2019-10-13 14:36:43 +03:00
kingofkosmos 280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
James 4e10294706 Mining points are back (#46548)
* Mining points are back

* Adds back the shaft miner starter kit cargo pack
2019-09-17 07:48:25 +02:00
spookydonut 68c8b71ae9 Changes power_change() to respect parent calls for toggling NOPOWER (#46486)
About The Pull Request

Similar to #46485
Now all relevant uses of power_change() call parent, theres a signal sent when a machine changes the NOPOWER flag, all remaining machines that were using power_change() instead of update_icon() have been fixed.
Why It's Good For The Game

code quality, eventually signal stuff. and signal stuff
2019-09-16 17:49:00 +12:00
Narcissisko fd070e3ae2 Adds a new luxury bar capsule to the miners vending machines which cost ten thousand mining points (#45547) 2019-08-08 01:07:20 -07:00
nemvar fb349b308a Remove debug message from mining vendor (#45706) 2019-08-04 10:05:33 -07:00
Rob Bailey 2c720c6408 No ID insertion for everything except the hop console (fixes the ORM) (#45693)
About The Pull Request

machines and consoles that previously required an inserted ID now check access on worn and inhand ids. They otherwise function identically.
Affected things:
ORM: click claim to claim cash to connected ID (also fixes it)
Mining vendor: uses ID on person or in hand.
medical console: checks worn ID
security records console: checks worn ID
gulag consoles: claim points to worn ID, checks access and point requirements from worn ID

Also some backend refactoring to prisoner management and gulag teleporter consoles

hop console will be next to strip out the shitcode entirely but this at least gets things functional in the mean time, but fully tested this time. It's very late here and I need to sleep. Due to the nature of it it's more elaborate of a rework.
Changelog

cl
tweak: Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID
tweak: mining vendor now reads from ID in hand or on person instead of requiring an inserted ID
fix: ORM is functional again (for real this time)
tweak: ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions
tweak: Same for gulag consoles
/cl
2019-08-04 22:53:55 +12:00
kingofkosmos f887a0b114 Console alt-clicking tweaks (#45193)
* * reworked consoles so you can:
 * use attackby to insert id
 * use alt-click to eject id
 * examine to see if alt-click is available
 * moved eject_id and insert_id procs to _computer.dm
 * added some sound effects

* * prisoner management console new features: insert id with attackby and eject with altclick

* * prisoner management console can't have multiple prisoner id's inserted

* removed unnecessary src. and changed usr --> user

* made gulag teleporter consistent with attackby, altclick and examine.
simplified attackby on card.dm

* equipment reclaimer station consistent with id attackby, altclick-eject and examine.
point claim console consistent with id attackby, altclick-eject and examine.

* ore redemption machine and mining equipment vendor made consistent with id attackby, altclick-eject and examine.

* * reworked all eject/insert ID copypastacodes into procs in _machinery.dm

* * 0's to FALSE

* hopefully i didnt mess up any more things in the resolve

* everything now uses id_insert-proc and doesn't work.

* compiles but doesn't work

* works
2019-07-28 16:25:36 -07:00
Swagile f13e7a432d Merge remote-tracking branch 'upstream/master' into Minerheadsets
Merging to fix conflict.
2019-07-20 15:23:40 -04:00
Swagile 12dc28a2cf Fixes(?) the problem
Re-adds the new line.
2019-07-20 14:56:32 -04:00
Swagile d5f95a20c0 Fixes conscription kit encryption key
Makes the encryption key mining instead of cargo, so you get science radio as well.
2019-07-20 14:18:17 -04:00
skoglol 9c9df48276 Better conscription kit, public lavaland mining vendor (#45089)
* Better conscription kit, public lavaland mining vendor

* no includes plx

* Removes pickaxe, adds seclite.

* Removes the cargo crate.
2019-07-11 20:55:52 -04:00
skoglol 63967d1b21 Lets the kinetic crusher be one-hand carried (#45110)
* Onehands, need sprites.

* onehand icons, light action.

* light fix
2019-07-11 11:29:36 -04:00
vuonojenmustaturska ef414ee4d7 [READY] Replaces mining points with money, adjusts gulag payout (#44507)
* woop

* adjust miner regular payout

* golem, orm upgrade changes

* liberator

* tgui.js
2019-06-18 10:17:34 -04:00
Tad Hardesty 3b2c0e27f7 Scope various unscoped locate() calls (#42195)
* Scope locate calls which are immediately checked against a list

* Remove silly use of locate from bible Topic

* Scope various locate calls (needs testing)

* More WIP

* Buff up lightswitches while we're here

* Tidy record browsing code

* Scope a few more locates

These have caused problems in the past (#41917, #39303). Continues #29349.

Also cleans up lightswitch code while I was already touching it.

I recommend a testmerge.
2019-01-06 20:39:27 +13:00
81Denton adb9296fce Removes superfluous sacid beakers (#40490) 2018-09-26 12:29:53 +03:00
ShizCalev f42288136c Allows departments to access their corresponding mech maintenance protocols (#40397) 2018-09-22 22:34:12 -04:00
Tad Hardesty 87d3a7d0e8 Fix missing icons for mining data cards (#39125) 2018-07-15 14:05:39 -04:00
Trevor Serpas bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
ShizCalev 89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
Grandmother of 50 f90fae0339 Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings) (#38153) 2018-06-20 00:43:10 -07:00
ShizCalev ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Tad Hardesty 2f212e16a3 Remove redundant anchored=TRUE from machines 2018-05-27 19:23:37 -07:00
81Denton 3ab5c8fdbc Adds departmental wardrobe vendors to all maps (#37992)
* pubby, omega, meta, deltastation

* groups/sorts autodrobe packs and mining vendor items

* moves delta bar vendor

* expands omega+meta private studies
2018-05-24 18:10:42 -07: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
kevinz000 f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Joan Lung 3cba04eb83 Improves mining voucher choices and minebots (#35633)
cl Joan
tweak: The crusher kit now includes an advanced mining scanner.
tweak: The resonator kit now includes webbing and a small extinguisher.
tweak: The minebot kit now includes a minebot passthrough kinetic accelerator module, which will cause kinetic accelerator shots to pass through minebots. The welding goggles have been replaced with a welding helmet, allowing you to wear mesons and still be able to repair the minebot without eye damage.
feature: You can now install kinetic accelerator modkits on minebots. Some exceptions may apply. Crowbar to remove modkits.
balance: Minebots now shoot 33% faster by default(3 seconds to 2). The minebot cooldown upgrade still produces a fire rate of 1 second.
balance: Minebots are now slightly less likely to sit in melee like idiots, and are now healed for 15 instead of 10 when welded.
balance: Sentient minebots are penalized; they cannot have armor and melee upgrades installed, and making them sentient will override those upgrades if they were installed. In addition, they move very slightly slower and have their kinetic accelerator's cooldown increased by 1 second.
/cl

the basic scanner sucks ass and nobody wants to use it, it's actually hilarious
also in those stats: minebot picked a mere 6 more times than the conscription kit, because it's an idiot drone, easy to accidentally hit, and did I mention how much it likes going into melee?

tbh it's quite possible the extra buffs aren't needed, just the passthrough module, but it's better to go a little too far rather than not far enough.
2018-02-20 09:49:49 +13:00
Denton 58dbee9df3 Ugprade -> Upgrade 2018-02-06 10:13:32 +01:00
Denton 15275514f9 resorts items, adds conscription kit 2018-01-30 21:25:08 +01:00
XDTM 3ecf74f1fd Xenobiology consoles can now scan slimes and apply potions (#34748)
* Xenobiology consoles can now scan slimes and apply potions

* no smack
2018-01-29 10:59:13 +01:00
vuonojenmustaturska a162837faf Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
* big batch of loc assignments

* Update emergency.dm

* Update spiders.dm

* Update parrot.dm

* Update ripley.dm

* Update firealarm.dm

* seems to work

* this maybe works?

* brainmemes, again

* stuff

* fix brainmob, camera runtimes
2017-12-13 20:56:39 +01:00
Jordie 8b19b490d1 JSON feedback (#32188)
* wip

* wip2

* makes code actually compile on 511 + fixes

* versioning

* s

* adds python conversion script, schema change and removes 'force ' from item_used_for_combat

* fix to compile

* forgot to actually commit this
2017-11-17 02:43:12 -05:00
FrozenGuy5 de0d93467e Adds alot of initialize() in lots of files 2017-11-11 20:58:15 +00: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 b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
ShizCalev 79eeed829e Makes the mining vendor give more verbose feedback 2017-09-26 23:29:46 -04:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00