Commit Graph

9281 Commits

Author SHA1 Message Date
Mickyan
2f5f44b619 chomp 2020-02-17 22:53:54 +01:00
Arkatos
255b06e649 Conflict resolution 2020-02-17 22:31:26 +01:00
Arkatos
fe5742bab2 Conflict resolution 2020-02-17 22:11:13 +01:00
Arkatos
187b698edd Assembly UI sanity, cleanup, TTV UI 2020-02-17 22:08:49 +01: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
moo
854c10408f Fixes Mafia Name Inputs (#49401)
* Update miscellaneous.dm

* silly me

* webedit 2, bad name boogaloo
2020-02-17 20:59:07 +01:00
cacogen
66295b2358 we make a slight edit to a comment
to force travis to run again
2020-02-18 08:05:18 +13:00
Arkatos
ec9e2a9e79 I said REAL tgui 2020-02-17 17:18:08 +01:00
plapatin
3a8f3dab76 webedit time 2020-02-17 07:04:47 -08:00
JJRcop
a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01:00
kevinz000
256d20cde0 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-02-17 05:50:27 -07:00
EgorDinamit
e580900b63 Merge branch 'master' into master 2020-02-17 14:57:50 +04:00
Bokkiewokkie
56bf4b4cdd Fixes boxes having writing where it shouldn't be (#49335)
* Fixes the things

so there's no writing wrongly put onto boxes that don't need it.

* accidentally wrote null in caps

of course i found a way to fuck up adding four lines of code
2020-02-17 10:57:10 +01:00
cacogen
300df18eaf Stun batons respect shields
Also successful clumsiness rolls now stop stun baton attacks rather than just attacking the user as well
2020-02-17 22:28:15 +13:00
Mickyan
a6ff3cc65c Adds the broom (#49120)
It's a broom

The basic janitorial tool that's been missing for all these years

Demo here: https://www.youtube.com/watch?v=KHcEIhAxx0g

🆑
add: Added the broom. For sweeping.
/🆑
2020-02-17 21:39:08 +13:00
Time-Green
980837fc79 PLUMBING: Lavaland geysers, pumps and regrettable balance decisions! (#49067)
Implements the geysers and pumps I originally added along with the first draft of plumbing.

Geysers
A geyser can be plungered with a reinforced plunger to activate. At wich point, it'll either produce clf3, hollow water, protozine or rarely wittel.

Pumps
Adds the liquid pump to the plumbing RCD. Place on an active geyser and wrench it to start pumping the geyser of its delicious juicess. I also changed it to not use power, because it would be awful drawing kilometer long wires along with the ducts.

Chems
Hollow water works basically like blood and mutage, where you can mix it with 1 unit of holy water for more holy water.

Protozine has a .2 healing, down from omnizine's .5. The healing is just kind of a side thing and not really what this chem was implemented for.

If it wasn't obvious, this allows chemists to industrialize strange reagent creation, with hollow water being able to create limitless holy water alongside protozine being a valid replacement for omnizine. Getting 2 geysers with those chems and on lavaland is quite the hassle, and you still need to get some holy water from the chaplain as kickstarter. I honestly think this is fine, and otherwise I could add a unique botany catalyst, so they don't become useless in the process.

Wittel
Adds wittel, wich is rare. Does nothing, but can be processed into two fun/regrettable chems.

Adds gravitum. Metabolizes very slowly. Drinking it makes you weightless, and spraying it makes that object temporarily weightless. Make 10u by mixing 1 wittel with 10 sorium

Adds metalgen. Created by mixing it with mutagen and bluespace powder. Must then be mixed with 40u of a powedered material and 1u of liquid dark matter.
The material used becomes imprinted on the chem. It can then be applied to anything, except mobs, to turn it into that material. Radiation is bad, and no you can't turn the nuke into plasma to blow it up.
The chem is difficult to get and use, but it can turn the escape shuttle into solid gold wich looks really cool. You could also turn it into plasma and vaporize everything. It can be used to, with some effort, duplicate materials.

🆑
add: Adds geysers to lavaland! They can be activated by using a reinforced plunger found in the medical vendor. They can be harvested by using a new plumbing device, magically powered liquid pumps!
add: Adds Hollow Water to geysers, wich can be combined with Holy Water as catalyst for more Holy Water
add: Adds Protozine to geyers, a very weak version of Omnizine. Can be used in Strange Reagent mixing
add: Adds Wittel, a very rare geyser chem. Can be processed into gravitum, wich removes gravity. Can also be processed into metalgen, wich has a strange tendency to transform objects into the imprinted material.
/🆑

Why:
This is what I originally wanted to do. The idea was to have a lot more chems, but I can't focus on one thing for that long. Hopefully this'll empower the bored chemist and make the rounds just that more interesting. Hopefully this'll spark the creation of some other geyser chems aswell.

That and makes shaft miners not the only ones hunting on lavaland.
2020-02-17 21:33:19 +13:00
Fikou
ebad3a9041 cockroach refactor (#48836)
About The Pull Request

cockroaches are now a hostile mob and glockroaches are a child
also glockroaches dont 1 shot tables and stuff anymore
Why It's Good For The Game

copypaste BAD??
Changelog

🆑
refactor: glockroach
/🆑
2020-02-17 21:24:00 +13:00
EgorDinamit
801e32b397 Merge branch 'master' into master 2020-02-17 09:19:15 +04: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
plapatin
a8fb93d896 nanotrasen-brand spacepod changes 2020-02-16 13:20:36 -08:00
Mickyan
56d08f9908 space drugs 2020-02-16 16:49:37 +01:00
EgorDinamit
41f8482e98 Merge branch 'master' into master 2020-02-16 16:59:37 +04:00
AnturK
e3fca45a78 Fix a few small runtimes (#49352)
Nothing special here, mostly sanity.
Defib hud is awful, needs rewrite.
2020-02-16 00:40:11 -08:00
ArcaneMusic
382b91dc64 Adds a new Space Ruin, the Hell Factory. (#49186)
* The hell factory is born. Initial Commit.

* Alright just makes sure to re-add the dmi files, so at least SOMEWHERE they exist

* I somehow lost my pressure plate fix and didn't actually fix the conflict.

* No, really, how did I break this so badly. Jesus christ.

* Quick anti-cheese measures.

* Made the map a bit more comfortable, APCs/ Keycard

* mapmerge hook :(
2020-02-15 23:44:14 -08:00
Arkatos1
18cdde84f0 Adds broken chameleon belt to the kit (#49336)
Adds broken chameleon belt to the broken chameleon kit
2020-02-15 18:55:10 -08:00
EgorDinamit
d596fd67a1 Merge branch 'master' of git://github.com/tgstation/tgstation 2020-02-15 11:52:35 +04:00
Bawhoppen
8b2a728291 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
#	code/datums/weather/weather_types/radiation_storm.dm
#	code/game/area/Space_Station_13_areas.dm
2020-02-14 21:28:55 -06:00
Buggy123
800457ffc8 Random mineral spawns change less turfs. (#49205)
As-is, random mineral spawning changes the turf to the subtype with that mineral, which results in a lot of turf changes I guess. Now it just changes the mineralType of the turf. Unless it's gibtonite or a cave spawner, because the alternatives are worse and those aren't all that common anyway.

🆑
tweak: Random mineral turfs no longer cause large amounts of turf changes on initialization.
/🆑
2020-02-15 13:34:15 +13:00
Arkatos
05c0cffe7c Radioactive Microlaser tgui-next 2020-02-14 23:42:57 +01: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
Krysonism
eb8b752e58 [READY]Da mafia update. Mob nicknames, new fedoras, suits! (#49029)
* base

* adjust suits

* Beige suit + fedora

* madonna

* fixes bug

* virgin mary

* Improvements

* Linter

* Removes duplicate sprite

* readds my fedora sprites.

* Gets woke(no sleep)

* linter

* readds my missing hats

* Call your parents

* resolves conflict yet again.

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-02-14 13:10:17 -05:00
iamgoofball
a799487fb5 fixes 2020-02-14 04:47:02 -08:00
iamgoofball
9c8050aeb6 You son of a bitch! I'm fixed. 2020-02-14 03:10:04 -08:00
iamgoofball
b8cb713aad You son of a bitch! I'm in. 2020-02-14 03:04:42 -08:00
necromanceranne
b1b6c9b4f6 Merge branch 'master' into claymore_take_two 2020-02-14 19:28:51 +11:00
necromanceranne
e18885e3c4 added kyrson's sprites and icon paths 2020-02-14 19:24:39 +11:00
EgorDinamit
b39fc74589 Merge branch 'master' of git://github.com/tgstation/tgstation into tgstation-master 2020-02-13 22:49:10 +04:00
Mickyan
0b3e1b524a Functional headphones (#48908)
* headphones

* adds element for mob icon updates

* corrects some "user" errors, literally

* now using signals

* removes extra space
2020-02-13 16:38:15 +01:00
Mickyan
02356009ec paramedic loadout 2020-02-13 14:15:22 +01:00
necromanceranne
77608a9f46 Adjusts Dark Gygax Equipment and stats, gives nukies a mech support bag. (#49131)
* Buffs the gygax, give some more support items for mechs in general since there isn't a need for a dedicated ammo bag for the gygax

* Wrong cell

* Fixed some stuff.

* I fucked up the wrench inhand good and proper yikes I am a dumb cat

* gave some inhands for the inducers

* Hopefully this adds the overlays for the wrench.

* Someone helped me make a much better wrench sprite after several failed attempts on my part due two tones being hard to make definable shapes with!
2020-02-13 09:58:35 +01: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
Unknown
09e2928770 Operative holsters no longer fit in backpacks 2020-02-12 15:29:48 -06:00
EgorDinamit
e8e87d4497 Merge pull request #1 from tgstation/master
Updating fork, because I don't know other ways.
2020-02-12 13:43:23 +04:00
Mickyan
84aadd8897 things 2020-02-11 20:37:23 +01:00
EgorDinamit
b60d8804fd Updated all needed files 2020-02-11 22:58:28 +04:00
itseasytosee
870a6e5bbd [READY] Omega soap (#49265)
* Omega soap

* Update code/game/objects/items/clown_items.dm

Co-Authored-By: swindly <swindly_tg13@aol.com>

Co-authored-by: swindly <swindly_tg13@aol.com>
2020-02-10 20:03:29 +01:00
Nick
02d4a9b8a8 Adds chameleon belt to cham kit (#49175)
* Update uplink_kits.dm

* sourc
2020-02-08 20:52:53 -05:00
Bokkiewokkie
bbb7f93c19 Adds missing box sprites and reworks some ammo boxes (#49057)
* Boxes

box images

* Aligned some box icons to box

and added secbox box to some security boxes.

* More Boxes

now available in medical, science and cargo!

* New shotgun and foam gun ammo boxes

and removed the medbox, scibox and cargo boxes since I think they should probably have their own pr.

* removed a thing

removes the mention of the sci, med and cargoboxes

* Removed the _old ammo box sprites

I mean it does what it says on the tin
2020-02-08 20:48:14 -05:00
Jordan Brown
d69cb0e34d Merge pull request #49188 from JJRcop/defib_nanites_check
Defib and Nanite Defib use the same can_defib proc
2020-02-08 15:09:39 -05:00
imsxz
ab4155e3d7 skateboard auto buckle (#49204) 2020-02-08 15:08:36 -05:00