Commit Graph

360 Commits

Author SHA1 Message Date
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
Mickyan
4cc8832299 gumbox size 2020-02-29 14:46:01 +01: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
moo
0133414559 Cobbduceus: (Baby) C2 Additions (Rhig,Troph) and Changes (Helbital) (#49356)
It's the year of the rat sisters, and now it's time to cut out those pesky C3s in your life!

Why It's Good For The Game

Rhig and Troph are no brainers considering they're on the same level of ease2make as the C2s and have no downside. They will still be good but they have some C2 component now. Kinda minor compared to the others but I'll see how it plays out.
Changelog

🆑
balance: Helbital now is more simple to use and is based off not crit/softcrit/hardcrit. You want to be in hardcrit for the best brute healing.
tweak: Troph has now been converted into a C2 with tweaks, now named Probital. Same recipe. Downside is stamina damage
tweak: Rhig has now been converted into a C2 with tweaks, now named Hercuri. Same Recipe. Downside is it can cool to dangerous levels.
/🆑
2020-02-22 22:24:36 +13:00
Mickyan
cebc8d428e Merge branch 'master' of https://github.com/tgstation/tgstation into chewing_gum 2020-02-20 16:09:01 +01:00
ShizCalev
f8ecffdebe Merge pull request #49245 from itseasytosee/Holster_timeishere
[READY] The holster overhaul is here.
2020-02-18 23:57:58 -05:00
ShizCalev
326b93a104 Merge pull request #49334 from Mickyan/paramedic_loadout
Tweaks paramedic loadout
2020-02-18 23:36:53 -05:00
Mickyan
7b17f20973 pop 2020-02-18 20:10:11 +01:00
Mickyan
81354500be glomp 2020-02-18 18:31:00 +01:00
Unknown
a98590dfff Slimes with belts? And clumsy people now shoot themselves 2020-02-17 17:40:34 -06:00
Mickyan
2f5f44b619 chomp 2020-02-17 22:53:54 +01: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
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
Mickyan
56d08f9908 space drugs 2020-02-16 16:49:37 +01: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
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
Unknown
09e2928770 Operative holsters no longer fit in backpacks 2020-02-12 15:29:48 -06: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
Flint
94daddb1ac Nukie holster 2020-02-08 12:12:50 -06:00
Flint
d7fdf26689 Size matters 2020-02-08 11:03:49 -06:00
Flint
b08ef6baa6 Missing words 2020-02-07 22:48:02 -06:00
Flint
ad3115af02 Puners 2020-02-07 22:35:57 -06: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
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
c21867735d Merge pull request #49013 from rdragan/wallet
Fixes wallet icons
2020-01-27 11:42:30 +01:00
Arkatos1
36dc328b4d Fix trashbag icons when emptying (#49001)
Trashbag will now properly update its icon state upon emptying or 
filling it with content.
2020-01-26 16:24:33 -08:00
Radu Dragan
52f7031c86 remove caching from wallet update_overlays() 2020-01-26 02:53:15 +02: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
Krysonism
9922f577af level 18 leather belt (#48835) 2020-01-18 19:29:24 -05:00
MrPerson
e22560a346 update_icon() improvements (#48669)
* update_icon() improvements

Fixes some update_icon() calls to properly call parent and use update_overlays() and update_icon_state().

The rest of obj/item fuck it

* Suggested fixes, also passes the linter

* I always forget . = ..() is faster than return ..() FOR SOME FUCKING REASON

* Actually this is better

* Signilzes datum/action to update its icon when its connected item does.
2020-01-11 23:46:43 -05:00
Fikou
8eee742734 [Ready] Adds ERP (#48699)
Adds a new emergency response team, the ERP! It stands for Emergency Response Party

the ERP includes:
-the coordinator: basically the captain of the operation, armed with a birthday cake, balloon and lots of fireworks to start the celebration
-the bouncer: the big boy, has a telebaton and an armor vest (if youre a loser you get a police hat too)
-the constructor: has tools, materials to build the party, disco tiles and an ethereal disco ball planter
-the cleaning service: your normal jannie, with his trusty mop, trash bag and cleaning grenades
-the comedian: a clown, armed with instruments, a bananium shield and chameleon suit/hat, for some comedy at the party
2020-01-12 13:31:13 +13:00
ArcaneMusic
39b58f1edc Adds several more uses for plastics (Trinkets, Trash, Decor, and Killing the Environment) (#48337)
* Initial Commit, Plastic Boxes and Soda Rings. Basic carp interaction.

* Beads, trash created from breaking plastic, carp eat plastic properly.

* Cleans up sprites, adds designs to autolathe, and adds plastic plants

* Icon Conflict more like Ion Comblict because I can't spell

* Oh neat, there's already a party crate. Added Beer/Soda 6packs to the crate, adjusted price accordingly.

* Aaaaaaaaaa runtime loop.

* You win this round travis.

* Makes the in-hand sprite the soda can sprite because honestly it's close enough don't @ me

* Typo.

* Merge conflict, style changes, FINE CARP DON'T BREATHE.

* BEGONE CONFLICT BEGONE FROM ME
2020-01-03 02:13:43 +01:00
Krysonism
5310876edc [READY]Sparklers, Firecrackers and Ian's New year's party. (#48480)
* Base comitt

* Adds Ian's New years helper to all maps

* Fixies + Festive corgi hat for Ian

* newline

* Apply suggestions from code review

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

* Implements more suggestions from review

* Fixes grenade spawn chance

* Puts qdel last again.

* Run mapmerger

* Run map merger on last map and makes box contain 20% more memes

* Update code/modules/mapping/mapping_helpers.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

* Moves var declarations to the bottom

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2019-12-30 22:59:14 -05:00
81Denton
3a0c5e75b3 Adds a new job: the Paramedic (#48236)
* Adds a new job: EMT

* adds code

* either adds or removes code, hard to tell at this point

* Never not on it, leanin' so hard you're ashamed
You can't dismiss this sick transmission, huffs your brain
Exhale your will and forget I ever knew you
Fuck do you do?
Fuck a man with hips for hulu
Rack a snitch, chalk and cue you
Corner pocket consume you
Too many hoes in my
Too many hoes in my motherfuckin' meal
Asking if I know how a motherfucker feels
How a motherfucker feels

* 300 hours in MS Paint

* map editing is almost as pleasant as CBT

* remove crepe

* indentation

* map merge

* crew pinpointer, EVA access

* sick sprites by twaticus

* Replaces pen acid bottle with calomel

* Moves crew monitor/pinpointer to premium

* Triple six, five, forked tongue
Subatomic penetration rapid fire through your skull
How I shot it on one taking it back to the days of trying to lose control
Swerving in a blaze of fire, raging through my bones
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah, I feel like killing it Takyon
Alright that's tight, what its like to experience Takyon
Out of the blue, in through the back
Door coming through like fuck what was that
Man I don't know, but it made me feel so heated
How we creep without showing you jack
Shit from below, give a shit if you know
'cause even if you did, you'd keep coming back
Back for more, need it man you're addicted to the heat
We make beats catch
Beat it til it bleeds to death, each track
Like EPMD snappin' necks as we tap energy
From everything on and off the map
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Takyon, shot down your throat like a keg of beer
Choke on the smoke we in and exhale 'til the whole chamber is clear
Haters act so fucking weird
Try to stain this atmosphere
But they can't 'cause its way too sheer
How to make a hater disappear
Take shit where it ain't never been
Fuck what you thought could not comprehend
This shit if I fisted your brain with it
10-9-8-7-triple 6-5-forked tongue
Criminal level crunk lightning storm
Get out the way or get up torn
Ain't a picture big enough to fit
What we dig up from the core
Of all that they forgot ever was
Militant march of this war
Takyon taking them down
All we see is blood
Takyon turning them out
How to trick out and freak that buzz
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Lunar eclipse forcing you to trip
Off the moonlit fire we spray
Cryonic haunted bullets hollow tipped with toxic waste
So here's the deal, if you don't feel ill
Don't want it nowhere near my zone
That shit is dead, can't nobody get
With that shit gets dial toned
Takyon bitch slappin pussy clots and clones
Takyon settin' off uni bombs inside your dome
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon

* YUH

* Updates sprites

* changes job order, uncomments plasmeme clothes

* Updates outfits

* last commit I swear

* bottle descriptions

* Renames EMT to paramedic

* Renames existing EMT clothes to paramedic as well

* Add missing job icons for Paramedic (#9)

SecHUD icon
ID card icon

* Improves descriptions

* Reverts vending balance change, replaces random spaces with tabs

* Resolves map conflicts

* Update strings/ion_laws.json

Co-Authored-By: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>

* Adds missing pda_slot to the paramedic outfit

* roller bed starting equipment

* Fixes map conflict

Co-authored-by: JJRcop <jrubcop@gmail.com>
Co-authored-by: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>
2019-12-27 10:29:12 -05:00
skoglol
0ea7c70dc3 Fixed santa, more presents (#48317)
* Fixed santa, more presents

* Uhh okay
2019-12-21 16:44:26 +01:00
Coconutwarrior97
d6422e03be Return of The New Donk Pockets 2: Electric Boogaloo (#48310)
* Adds new donk pockets and new donk pockets boxes icons and code!

* Accidentlty didn't add the pastries, oops!

* Adds the new donk pockets to the maint loot table, a donk pocket crate, and fixes a small typo under boxes which caused the honk pocket box to not appear.

* Final commit before PR, fixed a few bugs.

* Fixed a spelling error, and removed Gondola-Pockets from the maint loot table.

* Adds a new donk pocket loot spawner object, and updatesmaps to include it in the kitchen.

* Proper mapmerge, hopefully.

* Removed step_x and step_y, hopefully travis will be happy now.

* Switches out the new donk pocket icons for less noisy ones.

* Removes unnecessary lines of code.

* Adds craftable donk pocket boxes.

* Hopefully makes travis happy by fixing metastation errors.

* More metastation error fixes.

* Changes omnizine of warm honk-pocket to 1.

* Add path variable donktype, removed copy pasted populatecontents() lines of code.

* Fully working with removal of the copy pasted populatecontents() in favor of a path variable.

* Gets rid of component initialize where it does nothing

* Fixed some data loss with food icons.
2019-12-20 09:02:47 +01:00
Mickyan
55f19df748 Normalizes payouts and vendor prices to an approximate of cargo's credit value (#48174)
* prices & income

* more prices

* lower megaseed premium prices

* custom prices for premium tools

* slightly lowers prices for some snacks/drinks/cigs

* hey get back here
2019-12-16 17:43:27 +01:00
TheVekter
9f18ec829d Adds bronze/"brass" sheets to the Sheet Snatcher's whitelist (#48141)
* Adds emag effects to the mini-nuke and meteor toys

* Reduces range of mini-meteor explosion

* Normal meteor toy doesn't break after one throw, emagged one does.

* 90% of the time I have no idea what the fuck I'm talking about

* Adds brass/bronze to the sheet snatcher's whitelist

* I have no idea how this keeps happening
2019-12-09 20:48:25 +01:00
Couls
af0eb8e935 birdboat now chokes on plastic (#47551)
* birdboat now chokes on plastic

* update maps

* Update goose.dm

* cleanup and fixes

* more improvements, goose will eat any item with plastic now

* limit goose to only eating 10 food per turf

* End this nightmare

* more sanity

* Die in your own vomit you broken goose

Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>
2019-12-01 10:14:06 +01:00
skoglol
26d35b060c Debug outfit updates (#47923)
* New debug ID, cells in BRPED

* Debug glasses

* admin rcd
2019-11-30 03:54:57 -08:00
ATH1909
e6c123924a You can now exorcise possessed blades who are being undesirable (#47400)
* Update book.dm

* Update code/game/objects/items/storage/book.dm

Co-Authored-By: kingofkosmos <monggi@gmail.com>

* Update code/game/objects/items/storage/book.dm

Co-Authored-By: kingofkosmos <monggi@gmail.com>
2019-11-24 18:21:36 -05:00
Emmett Gaines
5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
skoglol
7f9d26c06b Increased max weight of tool and medical belt (#47614) 2019-11-14 17:59:42 -05:00
skoglol
f17265b267 Removes plumbing from the RPD (#47713)
* baby steps

* Removed plumbing from RPD
2019-11-13 02:54:28 -08:00
Firecage
87b1f56034 Re-organizes survival box code to be less horrendously ugly. (#47504)
* Adds clown and mime masks to their respective survival boxes, and re-organizes survival box code.

* Removes clown and mime masks from survival kits.
2019-11-03 01:49:35 -08:00
skoglol
43a41e35a7 Janitors start with holosigns again (#47513)
* Janitor start with holosign instead of barrier, barrier now only blocks carbons.

* And unconscious for the other ones too
2019-11-03 01:42:17 -08:00
Rohesie
9dd28d5180 ID fix (#47387) 2019-10-30 16:17:55 -07:00
Firecage
34427d9872 Some bags and belts can hold more stuff. (#47318) 2019-10-28 17:07:58 -04:00