Commit Graph

8292 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
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
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
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
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
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
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
6c20da6b66 Fixes spellbooks becoming unreadable if the mob moves (#49139) 2020-02-04 07:27:43 +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
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
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
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
AnturK
4fbf5b8118 Fixes pda manifest (#49115) 2020-02-01 04:42:51 -08:00
blessedmulligan
54dc879f19 Cyborg spin throwing now depends on intent (#48891)
Trying this again. When *spin-ing as a cyborg, the way mobs are thrown off you depends on your intent. On help intent, they will be thrown a shorter distance from you and will never be damaged or stunned (they will still be knocked down). On harm intent, they will be thrown the current distance and will be damaged and stunned if they hit a wall or another person.

WHAT THIS ACTUALLY CHANGES:
Currently, whether or not *spin-ing will actually hurt/stun someone depends on whether or not the *spin-ing borg is emagged. This PR also reduces the range of the help intent throw, but since the knockdown happens whether or not the thrown mob hits something this is in most circumstances a cosmetic change. So, in summary, if you are a non-emagged borg in help intent the only thing this changes is you will chuck people a slightly shorter distance.
Why It's Good For The Game

This isn't exactly the most important change, but a borg should be able to control their behavior. Having damage/stun from throwing determined solely by emag-ness seems more like a hacky kludge than a legitimate design choice. Also, having the behavior of borg-throwing determined in the code for carbons is messy.
Changelog

🆑
add: The behavior of cyborg's *spin emote now changes with intent; on harm intent, it will throw its passenger farther and damage and stun them if they hit a wall or another person.
/🆑
2020-02-01 20:30:57 +13:00
81Denton
3f694a598e Merge pull request #48919 from cacogen/pubbywayfinderbeacons
Pubby wayfinding beacons
2020-02-01 08:10:59 +01:00
AffectedArc07
6f5c638764 Adds a not garbage PDA manifest (#48915) 2020-01-28 18:31:36 -05:00
skoglol
398bbdbbec Removes dorms toolboxes, tool storage insuls and multitools. (#48856)
* Replaces tool storage insulated gloves with budgets.

* Removes multitools, dorms toolboxes

* Adds multitools to youtool premium
2020-01-28 18:06:58 -05:00
fluffe9911
00043330a0 New King Goat Lavaland Boss! (#48823)
About The Pull Request

This pr adds in a new lavaland boss in a seperate z level arena also included are goat plushies that ram into people and goat skins which you get by butchering goats and can wear on your head, a goat gun that shoots goats and finally multiple tweaks/fixes generally involving possible ways to teleport out of noteleport area and or cheese the king goat.
Why It's Good For The Game

Lavaland has not seen any new bosses for a long bloody time and although the boss may be a bit silly I feel more hardcore players will enjoy the challenge it brings since this is meant to be a very hard boss also new goat related items are always neat.

🆑 Fluffe9911 for porting/making most of it, Monster and Sabiran for the King Goat!
add: A new king goat lavaland boss!
add: Goats now drop skin which you can wear on your head! (coder sprite)
add: Goat themed plushies that ram people! (realistic version sprite by identification code by karma)
/🆑

goat

This is ported over from my work on yogstation with minor changes mostly to make things work there is more goat content I made but didnt wanna do too much at once and dont know if tg would like it
2020-01-29 11:50:27 +13:00
ShizCalev
f044bc1d70 Merge pull request #49052 from MrPerson/agent_cards_were_broken_and_nobody_cares_because_they_suck
Fixes Agent ID naming
2020-01-28 04:54:39 -05:00
ShizCalev
4c3a23bf52 Merge pull request #49034 from Names-Are-Hard/pai-law-fix
Fixes setting pAI laws
2020-01-28 04:50:51 -05:00
MrPerson
fbe82deca5 Fixes Agent ID naming
Fixes #49022

I botched a merge confict on this and broke it, my bad
2020-01-27 18:51:01 -06:00
spookydonut
ac7f2b5166 Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
2020-01-28 10:51:15 +13:00
AnturK
c21867735d Merge pull request #49013 from rdragan/wallet
Fixes wallet icons
2020-01-27 11:42:30 +01:00
Tlaltecuhtli
d29d87630c adds constable outfit in cargocrate (#48748)
🆑
add: contraband crate with british police outfit
/🆑
why is it good for gaming:
now they can buy thematic items and sec can do fun rp

description of what is added:
items added in the security vendor:
an hat with same properties of the helmet
a suit with same properties of normal sec suit for
a whistle with 10s cooldown
a pair of white gloves
a conversion kit which can turn a stun baton in a crappier police baton (no free batons and no "upgraded versions*")
for 1100 credits

prices are so sec can buy the whole reskin kit within 20 minutes of the round

tl note: police baton is more garbage than the roundstart free sec baton its for thematic rp
2020-01-27 23:41:40 +13:00
thebleh
ea9dc6082b update implantcase icons on initialize (#48984) 2020-01-27 11:26:25 +01:00
Names Are Hard
1ab54b76fe Fixes things 2020-01-26 21:53:32 -08:00