Commit Graph

510 Commits

Author SHA1 Message Date
spookydonut 5c2b8fc0d5 Advanced tool exports. (#49498) 2020-03-05 20:03:16 +08:00
Qustinnus b70e5c360c Adds a license press for in perma brig (#49452)
* temp

* adds cargo stuff

* dots

* woops

* Update code/game/machinery/prisonlabor.dm

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

* fixes

* Update code/game/machinery/prisonlabor.dm

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

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-03-04 23:19:21 +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
pireamaineach 8c8afcaaa2 [READY] Plasmaman sprite changes. (#49406)
* Does the thing.

* whoops I fucked up some item_states

* when I said item_states I meant icon_states also I didn't properly fix it

* Update hats.dmi

* Makes the prisoner suit look more unique.

* "Forcing the Icon Bot to Do it's Job"

* Update mime.dm

* Adds a new plasmaman name!

* Update plasmaman.txt

* Update plasmaman.txt

* Did the thing.

* plasmagloves^tm

* arms

* Update packs.dm

* Trailing newline done
2020-02-25 15:51: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
fluffe9911 5eea39977d [READY TO BE MERGED] King Goat Achievements, bugfixes, and minor tweaks (#49159)
* king goat memes

* I cant grammar

* newline

* the arena is no longer pressurised

* How into grammar

* I am embarrassed I did not notice this

* no hotel vacations in the arena

* better goat hoof sprite curticy of stephen

* new goat gun sprite

* might as well

* grammar

* no more king goat plushies in toy crates

* Update code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm

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

* done

* based and redpilled

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-24 20:47:42 -05:00
ShizCalev 4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13: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
XDTM 19655de8c7 Makes sixth sense only able to hear regular deadchat 2020-02-19 18:57:22 +01:00
ArcaneMusic 1a50fd4162 Brought a dead monkey corpse from 70-> credits value 2020-02-18 02:39:51 -05:00
ArcaneMusic f6771a3b3c Initial commit, basically all it needs. 2020-02-17 23:56:11 -05: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
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
Jordan Brown 134d4d74a9 Merge pull request #49184 from peoplearestrange/master
Removes "Special Verbs" category & reorganises admin buttons categories
2020-02-05 09:44:30 -05: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
peoplearestrange 91955efa8f Changes Category
Config/Launch Supplypod = Admin - Events
2020-02-04 04:40:32 +00:00
Emmett Gaines ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05:00
vuonojenmustaturska 40657c9ccd removes a bunch of unused/bad helpers (#48969)
* a commit

* Update code/controllers/subsystem/persistence.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/__HELPERS/text.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update advance.dm

* Update security_officer.dm

* Update text.dm

* Update unsorted.dm

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-01-28 16:22:20 +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
Rohesie 7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00
skoglol 4734de3805 Adds a launch random item option to the podlauncher (#48886)
About The Pull Request

Adds the option of picking a random item from the turf and sending it instead of sending the entire turfs contents. Helpful in situations where you dont want to send clones, but also want to spread out the items sent.
Why It's Good For The Game

Happy admins, happy life.
Changelog

🆑 Skoglol
admin: Podlauncher now supports sending a single random item instead of the entire turfs contents.
/🆑
2020-01-23 13:12:03 +13: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
spookydonut 3195ceaa22 Update SpacemanDMM suite to 1.2 (#48785)
* Update SpacemanDMM suite to 1.2

* Fix new lint errors
2020-01-16 11:49:39 -05:00
Nick 63b9cf1e7a [Ready]Adds fireworks to contrabrand lootpool(WE SMUGGLIN FIREWORKS BOIS) (#48658)
* Update packs.dm

* Makes it normal

* Update packs.dm
2020-01-10 22:09:54 +11:00
TheChosenEvilOne c851f1aebe Actually perhaps remove the money?
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 16:46:58 +02:00
TheChosenEvilOne 9544ed5ae2 Reviews
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-03 16:40:17 +02:00
TheChosenEvilOne c96a81469b Merge remote-tracking branch 'origin/master' into market 2020-01-03 16:15:14 +02: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
TheVekter da2b817e44 [READY] Moves Genetics to the Science department and makes Gen… (#48397)
* great googly moogly it's all gone to shit

* Fixed geneticist ID, moved in job list

* This is what I get for not building

* Fixed HUD sprite

* Finalized move to R&D code areas and updated sprites

* Mapping fixes on Meta

* Boxstation's turn and some Meta fixes

* Fixing map conflicts

* Moves genetics to science

SQUASHED:

great googly moogly it's all gone to shit

Fixed geneticist ID, moved in job list

This is what I get for not building

Fixed HUD sprite

Finalized move to R&D code areas and updated sprites

Mapping fixes on Meta

Boxstation's turn and some Meta fixes

Fixing map conflicts

* lmao travis

* okay you can pass travis this time

* DeltaStation changes

* lmao access bullshit

* Kilo also a few code/sprite fixes

* Pubbystation

* Removed gondolas because people hate fun
2020-01-02 06:15:35 -08:00
TheChosenEvilOne 249a2382b9 TUI-NZTX + 1 credits cr
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-30 13:22:00 +02:00
TheChosenEvilOne 1ff950f6a7 Merge remote-tracking branch 'origin/master' into market 2019-12-29 16:18:18 +02:00
cacogen 6b63bf7093 Changes $1 to 1 cr (#48414)
* $ to cr

* Payday messages use a proper span instead of asterisks
2019-12-28 16:29:36 +02:00
TheChosenEvilOne 34ff2d026a coder sprite
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-26 19:57:43 +02:00
TheChosenEvilOne dc56886ef4 a 2019-12-22 11:44:13 +02:00
wesoda25 a78788fbbd weewoo (#48322) 2019-12-22 09:33:09 +01:00
AnturK 9dd3da4445 Batch of runtime fixes. (#48268)
* Abductor implant runtime

* Point blank knockback runtime + cleanup

* dog food begging runtime

* Malf power loop runtime

* Explosive gondola pod runtime.

* Plasma shard runtime and related.
2019-12-21 18:40:10 +01:00
TheChosenEvilOne c269caa370 Merge remote-tracking branch 'origin/master' into market 2019-12-20 20:30:22 +02:00
TheChosenEvilOne d00c8a1a92 Changed some prices.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-20 20:28:44 +02: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
tralezab 82f7330833 ice peppers renamed to chilly peppers (#48289)
* 1

* 2
2019-12-18 20:20:23 -05:00
AnturK 54f32f26ad Fixes few minor runtimes. (#48234)
* Fixes emagging stuff without user

* Fixes missing initalizes

* Fixes deconstructing for materials

* Fixes tracker bullets runtime.
2019-12-14 14:15:15 -05:00
moo 93cf35b818 Some minor Ecobbomy items (Paystand Functions, Merchant Necklace for Admins) (#48205)
* 💰

* round

* added better feedback

* 150 hours

* 151 hours

* Update code/modules/economy/pay_stand.dm

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

* Update _neck.dm
2019-12-13 10:30:10 -05:00
TheChosenEvilOne ad5c9faa7c Make sure the user is still near the uplink after input.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-13 00:29:20 +02:00
TheChosenEvilOne ad36339586 Items now actually get added to the market.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-12 22:07:41 +02:00
TheChosenEvilOne d4b935e429 UI improvement, I guess
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-12 18:24:09 +02:00
TheChosenEvilOne 08619b9418 Merge remote-tracking branch 'origin/master' into market 2019-12-12 18:14:38 +02:00
TheChosenEvilOne 97cd9d9f64 self review best review
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-12 18:13:44 +02:00
spookydonut 175439f63a Removes unreachable code (#48143)
About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123
2019-12-10 20:52:13 +13:00
TheChosenEvilOne 8b24c2e6cf src.src.src.src.src
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-04 17:53:27 +02:00
TheChosenEvilOne fa34a092ea fixes to comments & doc & log.
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-12-04 17:30:49 +02:00