Commit Graph

1859 Commits

Author SHA1 Message Date
spookydonut 319ca52545 removing unnecesary double parent proc calls (#49694)
* removing unnecesary double parent proc calls

* i made an oopsie
2020-03-05 18:51:37 +08:00
Qustinnus 4b2a8aebe5 [READY] Meat material & material datum turf support (#49402)
* temp

* meatwalls

* more

* adds sheetifier

* fix

* two

* mat texture + 4dplanner admin (#21)

* mat texture + 4dplanner admin

* keep together trait

* counter instead of trait

* finalizations

* woops

* fixes

* oopsie

* only set starting keep_together if necessary (#24)

* keep together as trait again

* remove false comment

* doc for TRAIT_KEEP_TOGETHER

* remove needless scoping

Co-authored-by: 4dplanner <3combined@gmail.com>
2020-03-04 23:18:08 +08: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
skoglol a57602b0a8 Merge pull request #49599 from ExcessiveUseOfCobblestone/metal-plates
Defib mounts are now roundstart but do not recharge. Rechargable variants still exist.
2020-03-03 01:01:35 +01:00
skoglol 24de591c87 Merge pull request #49636 from Ryll-Ryll/let-there-be-tape
Puts basic sticky tape in autolathe, makes pointy and super sticky tape the BEPIS major reward
2020-03-01 15:22:35 +01:00
skoglol 24803bd33d Merge pull request #48994 from ArcaneMusic/arconomy
[READY]Arconomy: Adds the Vend-A-Tray and the Card Reader stock part
2020-02-29 23:04:31 +01:00
Ryll-Ryll e21e317a0f more tape 2020-02-29 06:09:31 -05:00
nightred 70a3925567 fever and shivers change body temp normal 2020-02-27 20:22:05 -06:00
TheVekter c0c21389e3 Autodoc for XB and Research defines (#49575)
* Adds some auto documentation for Xenobiology

* Fixes spacing
2020-02-28 11:14:18 +13:00
ExcessiveUseOfCobblestone 6ec68b1d6e penlite bros 2020-02-26 23:11:28 -05:00
ArcaneMusic 2b47a06b89 Merge conflict. 2020-02-25 13:12:59 -05:00
ArcaneMusic 13e6c0b628 Merge remote-tracking branch 'upstream/master' into arconomy 2020-02-25 13:11:56 -05:00
ArcaneMusic 94f27c7b25 [READY]Arconomy: Sales Taggers, split profits on barcoded, sold items! (#49111)
* Startwork

* "Arcane: Everything works up until the export datum bullshit"

* I got up to "Split Profit" in "sell object"

* This is when I switched over to components and it STILL doesn't work

* alright stopwork for the 'night'

* So this is the version that crashes

* One step further in my descent to madness.

* Alright, this should be working (Minus maybe profit_split)

* Alright splitting up custom sales splits is broken right now.

* Profit split works now.

* Alright what the hell is going on here.

* Revert "Alright what the hell is going on here."

This reverts commit 6cb3b6eb56ea45ede3496bbe219ca18302c806e2.

* Oh wait, I can do commit messages through VSC?

* Adds a quick little box with all the shipping supplies you'll ever want, unwrapping signal

* Added shipping box to all maps and the service/cargo lathes.

* Fuck you mapmerge hook you ain't shit

* Alright, yet another take of making it get rid of the pricetag

* [3:43 PM] oranges: anturk is smart (This is true)

* Tested, cleaned up component procs,  and limits signals sent a bit.

* Whoops

* Other comments from Ninja over discord

* Left in a comment line.

* Fixes the issue with ind. barcodes, adds examine.

* Well thank GOD the children wern't there to see it

* Adds a do_after to prevent accidents.

* Fixes merge conflicts

* Fixes merge conflict. Twice in one day.

* Fixes merge conflict.

* one tiny bit of documentation

* Travis play nice.
2020-02-25 20:42:01 +08:00
spookydonut 1a9ddbee5f Merge pull request #48959 from Ryll-Ryll/embeddead
Refactors embedding, adds harmless embeds, sticky tape, admin buttons to make everything embeddable
2020-02-24 15:43:36 +08:00
Ryll-Ryll 7e384752e6 moves topic, cleans code, adds sticky tape to maint loot 2020-02-23 06:50:18 -05:00
TheVekter bc44988ba2 [READY] R&D Rework: Splits anomaly cores into separate versions, modifies build paths (#49448)
* Splits anomaly cores into separate versions

* Converts the wormhole projector to require a bluespace core.

* Cleaned up a few lines

* Fixed small bug issues

* The gravity gun now requires a grav core. Increased weight of some anomalies.

* Enables high-intensity grav anomaly

* Fixing minor issues
2020-02-22 20:40:40 +01:00
ShizCalev c6fa3711ac Merge pull request #49446 from Dennok/patch-6
Add Rapid Pipe Dispenser (RPD) to enginering protolathes.
2020-02-20 22:55:29 -05:00
Dennok c05c0e6fef no rpd in autolate 2020-02-20 22:13:32 +02:00
Bobbahbrown 476399a346 the span of these changes is immense (#49432) 2020-02-20 13:48:13 +01:00
spookydonut 6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08:00
ArcaneMusic ea475c528f Merge remote-tracking branch 'upstream/master' into arconomy 2020-02-20 02:51:18 -05:00
Dennok b1aaed14ad PRD to adv_engi node 2020-02-19 12:26:37 +02:00
Dennok a4d522dda4 RPD design 2020-02-19 12:21:29 +02:00
ATH1909 f2bef8b16f Update biogenerator_designs.dm 2020-02-18 14:11:24 -06:00
Ryll-Ryll 1fae3d4c22 new beginnings 2020-02-18 02:06:35 -05:00
ShizCalev 7209ac3c93 Removes unnessacary math defines 2020-02-17 23:09:09 -05:00
ATH1909 2405e76cb8 Update biogenerator_designs.dm 2020-02-17 21:38:30 -06:00
XDTM 99500d05e0 Adds the Enhanced Interrogation Chamber as a BEPIS tech node (#49047)
About The Pull Request

Adds the Enhanced Interrogation Chamber as a BEPIS reward.

This security-only machine is able to implant a deep-rooted trigger phrase onto a subject; if they hear that phrase after the procedure, they will immediately enter a state of hypnotic trance, which can be used to demand truthful answers for your ongoing investigation.

The enslavement of criminal and non-criminal subjects is frowned upon by space law. Do not abuse the Enhanced Interrogation Chamber for personal gain.
Bad choice or mishandling of trigger words may lead to loss of control over the subject.

Side effects include dizziness, nausea, confusion, vomit, loss of eyesight, violent tendencies, loss of sanity, depression, oppression, loss of free will, spontaneous hypnotic trance, loss of hair, death.
Use with care.
Why It's Good For The Game

Make your own Manchurian Candidate!

Allows "rehabilitation" of dangerous criminals by security, which is more interesting than straight-up execution.
Could lead to fun situations if a team antag is caught and forced to be a mole.
It could also be used by any antag who manages to get to the sec protolathe.

However, the "conversion" is still shaky! The main cure is surgery, as the triggered trance is effectively just a brain trauma, healable with surgery. On top of this, even if the subject is unable to hear their trigger phrase, if someone else knows it they can override commands at any time. Even if that doesn't happen, it's possible that another message sneaks in before you can give your command, intercepting the hypnosis.
On top of this, the chamber has a 10% chance of giving the hypnotic stupor trauma instead of the triggered trance, making the subject even more of a wildcard.

Effectively, this is a very powerful tool in the antag-vs-security conflict, but over-reliance on it will probably bite back in amusing ways.
Changelog

cl
add: Added the Enhanced Interrogation Chamber as a BEPIS researchable tech.
add: The EIC can be used to implant trigger phrases in subjects that cause an instant hypnotic trance.
/cl
2020-02-18 09:34:14 +13:00
Emmett Gaines 9e34b3d6a1 Supports named arguments in AddComponent and AddElement (#49098)
AddComponent/AddElement now support named arguments. This requires passing around an argument list instead of using actual proc args which a bit gross but we can blame byond for forcing this.

InheritComponent uses mirrored init arguments instead of an argument list which means no more accessing it via index to get to the same arguments as in init.

As a small bonus I restructured dcs defines to be a bit more manageable. Mainly just splits them into separate files and gives them their own folder.
2020-02-17 17:57:52 +13:00
yeeyeh e14313b9e6 Adds spray-on insuls. (#48996)
* Adds spray-on insuls

* gloves go bye bye if you lose an arm

* whoops

* merge conflicts? in MY pr? its more likely than you think

now featuring Signals™

* travis you fuck

also adds feedback if you cant spray them on

* forgot to remove a commented out line

* Removes snowflake

that moment when you lose all motivation to code after getting a review so you put it off for a week and then it goes stale 5 minutes after you start working on it again

* Uncurses gloves

* formalities

thank you arcane man

* formatting fix

i swear i used the tab button but i guess i am just cursed

* thank you strange bee creature

thank you strange bee creature

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-02-16 18:01:05 -08:00
nightred 395bebcdcc [READY] Space Suits use cells and warm the wearer (#49028)
About The Pull Request

This makes space suits use a cell and warm the wearer, This was handled by the handle_environment proc in the past with an override to make the suits work. This corrects this issue, and removes the override.

All space suits will have a cell installed at round start, this cell will last 15 min on average usage.

The cell cover can be toggled by alt+clicking (press the button), or using a crowbar (just pry it open) on the suit.
With the cover open you can remove the cell by using the suit in hand, or ctrl+clicking the suit.
As well with the cover open you can use a screwdriver to set the thermal regulator's temperature. The normal range is 20 c to 45 c, do not use an emag on the suit to increase the temperature range.

Examining the suit will report the temperature setting and the cells charge, if the cover is open you will also be able to see the type of cell that is in the suit.

Suit storage units will now charge the cells in suits, they will also require power to operate properly now.

Why It's Good For The Game

    Space suits should be managing the wearers temp in space not using some override.
    Lizards now have a portable heater in the form of any space suit.
    Now that suits need a cell it is not as easy to spend all session in a space suit.
    New interactions with hardsuits and emp's give nice combat buff to an underused item.
    Nuke ops can raid xeno for some nice yellow cells, or science for a big old bluespace cell.
2020-02-15 11:32:54 +13:00
spookydonut ec6b6df101 Merge pull request #49322 from XDTM/PermaDeath
Fixes nanite deactivation timer
2020-02-14 15:03:27 +08:00
Tlaltecuhtli 7cbcd2ff3c adds medipen refiller machine (#49172)
* 1

* Update machine_designs.dm

* 2

* clean up

* more clean up

*  🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆

* Update code/game/machinery/medipen_refiller.dm

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-12 18:48:19 -05:00
XDTM 837767d883 Fixes nanite deactivation timer 2020-02-12 21:03:55 +01:00
Qustinnus d646e37bae Bepis design: Table with wheels part 2: electric boogaloo (#49010)
* WHEELS

* design

* epic

* rolling table fixes

* test

* dumb

* 1`

* fix
2020-02-11 20:15:05 -05:00
ArcaneMusic 0330bf7ef5 Merge remote-tracking branch 'upstream/master' into arconomy 2020-02-10 15:56:29 -05:00
Jonathan (JJRcop) Rubenstein c52403f7fa Nanite defib uses can_defib proc 2020-02-07 18:04:48 -05:00
cacogen 9436ed69a8 Makes abductor baton child of stun baton (#48766)
* Makes abductor baton child of stun baton


- Clarify var names and reorder vars in baton defines
- Slightly simplify active baton wash code

* forget about ()
2020-02-07 14:53:14 +01:00
ArcaneMusic 38a675b544 [READY]Adds a new minor reward to the BEPIS, Party Pods. (#48654)
* Initial commit, adding to minor techs after

* Adjusts window size, adds as a minor reward.

* english good me do

* I swear, really officer, I'm not drunk, I just can't type

* Alright fine maybe I should sleep

* FINE we'll go with this. I legitimately don't even drink

* Alright this clearly isn't working yet.

* Fixes touch reagents, and gives lead acetate some real-life symptoms thanks EOB

* _Perfection_

* Nobody told me I was conflict with my own file!

* Allows for touch reactions in a slightly more sane way. Hopefully.

* alright holup

* Minor minor change to the UI so that the menu doesn't clip anymore, swapped for the other barber's aid.

* Hairgrowth works now

* Fixes merge conflicts?
2020-02-07 14:52:29 +01:00
skoglol a28b24f149 Completely removes cloning (#48668)
* Removed from code

* Removes cloners from maps

* Some more references, now compiles.

* Reduces availability of replica pods

* DNA scanner and tech disk rebranding

* pubby door name, cargo pack description
2020-02-04 16:04:06 -05:00
skoglol c44e913803 Some more cloning prep stuff (#49090)
* defib texts improved, now gives a little guidance.

* Removes the superfluous braindeath

* Organ repair surgeries now repeatable

* Death info message

* Reverts repeatables, improves brain repeatable

* defib more forceful, better brain messages, better mannitol healing.

* OR

* Update code/modules/surgery/brain_surgery.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-04 13:50:56 -05:00
Emmett Gaines ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05:00
81Denton 4059e671b3 Merge pull request #49084 from ArcaneMusic/bruteforcebalance
B.E.P.I.S. balance. Techs cost a bit less, and cleans up minor rewards.
2020-02-01 08:37:48 +01:00
81Denton 0a7e819b07 Merge pull request #48882 from XDTM/BepisProgramsPartOne
[Ready][Ready]Adds the Nanite Replication Protocols node to BEPIS
2020-02-01 08:05:00 +01:00
cacogen 779478bd87 removes unnecessary \the's and \a's 2020-01-30 11:02:38 +13:00
cacogen 42fbb38591 Fixes #49061 2020-01-29 22:19:34 +13:00
itseasytosee 165602d45a Plastic Ducks (#48885)
Nanotrasen has just come out with a new clown tech design, Plastic Duckys™. Move aside expensive rubber donk.co and waffle.co brand duckies. These quality* made ducks are fabricated at our finest research stations with industrial-grade** protolathes. Made from chemically processed plastics from our expert*** chemists!
Plastic ducky
Why It's Good For The Game

plastic uses are neato. This may be controversial as it ads a potentially unlimited source of honks but if people think this is really an issue then I would consider adding a bananaium cost that would make it on par with other printable honk items.
Changelog

🆑 itseasytosee
add: Nanotracen is beginning to dabble in toy-making technologies. Clown tech now adds a design for a cheap alternative to rubbers ducks made from plastic.
/🆑
2020-01-29 11:57:57 +13:00
ArcaneMusic 9a0b4c8b77 I should leave this comment here as well 2020-01-28 06:19:47 -05:00
ArcaneMusic 79ceb1db7f Now rewards are spawned in a less garbage way 2020-01-28 06:18:32 -05:00
ArcaneMusic 432eaf604c Merge remote-tracking branch 'upstream/master' into bruteforcebalance 2020-01-28 05:48:30 -05:00