Commit Graph

12857 Commits

Author SHA1 Message Date
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
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
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
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
EgorDinamit
be5df32fe1 Update ghost_role_spawners.dm 2020-02-14 12:33:03 +04: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
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
EgorDinamit
36c6bf443a Probably the last update 2020-02-13 12:25:33 +04:00
EgorDinamit
7ce6bad46c Update 2020-02-13 11:57:11 +04:00
PKPenguin321
f8c3049f25 Salt now dissipates when ran over too much (#49257)
Running over salt (that is, moving over salt while not walking) will 
slowly dissipate it. The first two times, nothing will happen, but the 
third time the salt will be fully scattered away.

I think salt is a hard enough counter to revenants that it's impossible 
to justify how easy it is to apply and how relatively permanent it is 
once it's applied. Salt smoke can coat entire departments in salt in 
seconds, locking revenants out of them forever with essentially 0 
effort.
2020-02-12 19:41:23 -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
EgorDinamit
e1d7000117 Update-update 2020-02-12 23:56:26 +04: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
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
EgorDinamit
b60d8804fd Updated all needed files 2020-02-11 22:58:28 +04:00
EgorDinamit
97d8295309 Updating forgotten ship ruin 2020-02-11 21:11:22 +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
Jonathan (JJRcop) Rubenstein
3b1b4c293a Move can_defib proc to carbon 2020-02-07 18:02:30 -05:00
Fikou
8deeceefb6 [READY] Adds rideable Goliaths (#49003)
* adds rideable goliaths

* stamding on the emdge

* plems work

* this should be it

* FUCK YOU TRAVIS

* primal friendly

* ok athath buddy

* mmm grayons

* sprite gang

* placeholder sprite, works till someone makes a new one maybe haha

* lets do this

* An object tames a monstrous beast somehow. More news at 5.
2020-02-07 17:00:07 +01: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
Jordan Brown
c0e897fe59 Merge pull request #49048 from 81Denton/trophycase
Fixes constructed display cases starting with an alarm system
2020-02-04 11:09:10 -05:00
Jordan Brown
ce9577663a Merge pull request #49173 from ninjanomnom/material-lazy-init
Makes the global materials lookup lazily initialized
2020-02-04 11:05:59 -05:00
ShizCalev
bfb4218a87 Merge pull request #49176 from AnturK/runtimesareforever
Few more runtime fixes.
2020-02-04 04:08:53 -05:00
ShizCalev
6c20da6b66 Fixes spellbooks becoming unreadable if the mob moves (#49139) 2020-02-04 07:27:43 +01:00
ShizCalev
3055b70349 emitter cleanup and fixes (#49129) 2020-02-04 07:14:41 +01:00
itseasytosee
0837547ff9 Adds 3 new toys to the prize pool not removing all of science edition. (#49122)
* creative

* God damn it Travis

* Trick blindfold looks like a blindfold at first glance
2020-02-04 07:07:14 +01:00
Qustinnus
48de09b7a4 Edible component; be gone vile organ code (#48596)
* component

* progress

* stuff

* Makes minor progress on edible component

* Finishes component and applies it to organs

* newline

* forgot to send signal

* domob addition

* wave that organ flag

* return adde

* fixes some minor issues

* fixes

* done

* done

* done

* added last one

* done

* done

* fix
2020-02-04 01:05:55 -05:00
Mickyan
e985a0a18f Blood dripping scales with bleeding rate (#49092)
* bleed decal rate

* forgot this guy
2020-02-04 07:00:24 +01:00
cacogen
bbdb22a346 Improves cyberimplant readout (#49087) 2020-02-04 06:58:11 +01:00
Emmett Gaines
2cf7728494 Removes the bitflag helpers (#49106) 2020-02-03 16:26:00 -05:00
skoglol
a97b90bc3f Slight adrenal buffs (#49140) 2020-02-03 12:23:46 -05:00
Emmett Gaines
ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05:00
AnturK
5af512f8f1 Removing wanted poster fixup 2020-02-03 10:18:04 +01:00
zxaber
79e59077eb Allows defib units to be used as medical borg upgrades, adds message to borgs when they recieve an upgrade, re-organizes borg attackby(). (#48805)
* Delete stale.yml

* Create stale.yml

* clear

* Can now replace the defib pack with an upgrade card to get the pack back.

* less redundant checks

* borg > cyborg text changes
2020-02-02 22:08:40 -05:00
RaveRadbury
8b19d797ca [Ready] Prisoner role (#48819)
About The Pull Request

I observed someone request to be perma'd round start and then they just chilled in perma the whole shift. Security isn't always going to be up for putting people in perma and players who have been placed in perma tend to go catatonic. This allows players who are interested in having a chill shift doing the stuff in perma and acting like they've done crimes the opportunity to do that.
Why It's Good For The Game

Crew content. I'm not saying it's mindblowing but if we add it in as a role it will open the door for people to look at perma and what could be done with prisoners.

Prisoners spawn with a prison ID, a jumpsuit, and shoes. They are also currently spawning with a backpack and I'm uncertain about whether or not I want to do anything with that.

This is ready for a testmerge and worked for me locally.

Thanks to Tralezab for assistance with merge conflicts.
Thanks to EOBGames for the plasmaman prisoner sprites.
Thanks to Quill-Weave for encouragement.

Feedback is of course welcome, and I'd appreciate suggestions re: balancing this role. Maybe they should be roundstart pacified or something.
Changelog

cl
add: Adds prisoner role
/cl
2020-02-03 09:54:03 +13:00
MrPerson
12eecfd181 Makes raw HTML and browser datum popups UTF-8 aware (#49066)
* Makes raw HTML and browser datum popups UTF-8 aware

Admin menus specifically really shouldn't break just because you named some guy "☺s the Clown"

* Fixed new_player.dm

* Fucking filing cabinets
2020-02-01 22:14:31 +01:00