Commit Graph

37 Commits

Author SHA1 Message Date
SkyratBot
cd40957a79 [MIRROR] Split mining.dmi [MDB IGNORE] (#15836)
* Split mining.dmi (#69442)

* split mining.dm

* Remove a pair of unused icons

* From merge conflict

Co-authored-by: tattle <article.disaster@ gmail.com>

* Split mining.dmi

* Also fixes Gibtonite in the same PR.

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tattle <article.disaster@ gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-08-28 15:50:27 -04:00
SkyratBot
815644afb7 [MIRROR] adds sheep [MDB IGNORE] (#15826)
* adds sheep (#69318)

* adds funny sheep (need non-placeholder sprites still)

* indent this

* code suggestions

* components all the way down

* async

* sprites + reference

* think i did this right

* Update code/datums/components/mob_harvest.dm

Co-authored-by: san7890 <the@ san7890.com>

* steal shiz's suggestion pt1

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* steal's shiz's suggestion pt2

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* steal's shiz's suggestion pt3

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>

* adds sheep

Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>
2022-08-25 14:45:43 +01:00
SkyratBot
f0cef47678 [MIRROR] Adds the Mothroach [MDB IGNORE] (#15399)
* Adds the Mothroach (#68763)

About The Pull Request

Yup. That's pretty much it. This PR adds the Mothroach to the game, described as "An ancient ancestor of the moth that surprisingly looks like the crossbreed of a moth and a cockroach."

Do you love the Mothroach? Then you can cuddle with it and pat it, as well as place it on your head for extra cuteness.
What if you hate it, though? You can always kill and butcher Mothroaches in order to mass produce moth plushes for your own profit... How fun!

Either way, you win!

The Mothroach can be picked up and has a special on-head sprite (which looks really cute). It is able to vent-crawl and you may get one by randomly summoning a friendly mob through the gold slime extracts, or by ordering one through the Cargo Requests. After butchered, you may use its hide, a heart, and some cloth to craft a moth plushie, the most devilish of Devil's designs.

Full Preview of all the Sprites (NEW): https://www.youtube.com/watch?v=pdg8FTNEYjI
Preview of some of the Sprites (OLD): https://www.youtube.com/watch?v=9A-8hGCiW0s
In-hand, on-head, and grounded Mothroach sprite credits go to ValuedEmployee.
I did the Mothroach hide sprite though!
Why It's Good For The Game

The Mothroach is incredibly cute and a neat, fresh, new piece of content. Although it could use some future repurposing, right now it's simply a cute exotic pet with a few interactions.

These cute sprites are just too good to go to waste...

I keep seeing people complain about the lack of new content. Well, here's something niche that won't break the whole balance of the game and that will be cute. I seriously cannot see a motive not to add this to the game. Just because it isn't a powergaming tool or something that is seen every shift, that doesn't mean that it won't have a positive influence on the game. As I have stated, right now the Mothroaches are underperforming in terms of interactions and ways of getting them, but adding them is the first step to later improve them.
Changelog

cl
add: The Mothroach, your new local exotic pet
add: Mothroach Hide and Mothroach Meat
add: New crafting recipe for the Moth Plush: 1 Mothroach Hide; 1 heart; 3 cloth
fix: Fixes dead mobs on-head not having sprites
/cl

* Adds the Mothroach

Co-authored-by: Justice <42555530+Justice12354@users.noreply.github.com>
2022-08-05 01:03:04 +01:00
SkyratBot
141f7fa1e0 [MIRROR] Resprites the Runite Bar and its stacks [MDB IGNORE] (#12313)
* so runescape is a funny game with funny assets (#65617)

imageadd: Runite Bars have a nicer appearance.

* Resprites the Runite Bar and its stacks

Co-authored-by: AdipemDragon <76874615+AdipemDragon@users.noreply.github.com>
2022-03-26 23:22:49 +00:00
SkyratBot
410f25af10 [MIRROR] Bamboo Overhaul (Port of Beestation Hornet #5703) [MDB IGNORE] (#10884)
* Bamboo Overhaul (Port of Beestation Hornet #5703)

* Update code/__DEFINES/icon_smoothing.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-01-22 19:09:39 -05:00
SkyratBot
897855b0eb [MIRROR] Adamantine will now use a distinct sprite rather than metal hydrogen one. [MDB IGNORE] (#9376)
* adamantium resprite (#62707)

It's simple really - looked through materials to see what could I do for wallening, and found that the metal hydrogen and adamntine share their sprites, so went ahead to make these distinct sufficiently.

* Adamantine will now use a distinct sprite rather than metal hydrogen one.

Co-authored-by: darkmanx37 <33235060+darkmanx37@users.noreply.github.com>
2021-11-10 14:57:01 -05:00
SkyratBot
8865414649 [MIRROR] Hot Ice stack icons [MDB IGNORE] (#9124)
* Hot Ice stack icons (#62309)

imageadd: Hot Ice icons are now consistent,

* Hot Ice stack icons

Co-authored-by: esainane <esainane+github@gmail.com>
2021-10-29 06:55:53 -04:00
SkyratBot
210b17557e [MIRROR] Cytology Adjacent Update #2: Carp scale crafting. [MDB IGNORE] (#8682)
* Cytology Adjacent Update #2: Carp scale crafting.  (#61913)

expansion: Adds carp scales, and carp scale crafting.

* Cytology Adjacent Update #2: Carp scale crafting.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-10-08 07:47:10 -04:00
SkyratBot
26f934c258 [MIRROR] Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton) (#8076)
* Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton)

* EEEE

* E

* follow the fucking guidelines

* E

* Update CentCom_skyrat.dmm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:27:01 +01:00
SkyratBot
ccc38b0fc4 [MIRROR] Trash Cannons (#7225)
* Trash Cannons (#60476)

* Trash Cannons

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-07-29 11:15:03 +01:00
SkyratBot
e1c7ca12d1 [MIRROR] Wrapping Paper GAGS (#6309)
* Convert wrapping paper sprites to GAGS (#59374)

Wrapping paper has been put through GAGS. You can set the base color and ribbon color with right click, then apply it to a package.

Co-authored-by: coiax <yellowbounder@ gmail.com>

* Wrapping Paper GAGS

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
2021-06-14 18:42:46 +12:00
Gandalf
553b707ba3 aaa (#5016) 2021-04-18 21:31:42 +01:00
SkyratBot
640cc9744c [MIRROR] [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#3697)
* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#56889)

* crystallizer

* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-02-27 18:55:16 +00:00
SkyratBot
a765e5b0db [MIRROR] Pirates are split into three different ghastly crews! (#3395)
* Pirates are split into three different ghastly crews! (#56264)

Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Pirates are split into three different ghastly crews!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-15 13:32:35 +00:00
SkyratBot
0464184fc3 [MIRROR] Removes capitalism and communism golems [the sun sets on freedom] [fall of the iron curtain] (#1502)
* Removes capitalism and communism golems [the sun sets on freedom] [fall of the iron curtain] (#54637)

About The Pull Request

Removes commie and cappy golems, and all connected parts and features.
Why It's Good For The Game

You're downloading 5 mb of capitalist and communist songs and talk sounds every time you log into a server, which makes it take much longer to actually join the game. While this was a good meme and became even better when cappy golems would fight the communist ones, they are:

    Really really underused for what they are
    Really really boring and simple without all the special sounds
    Really really not worth keeping gutted

Changelog

🆑
del: Capitalism (golem) and Communism (golem) are dead.
/🆑

* Removes capitalism and communism golems [the sun sets on freedom] [fall of the iron curtain]

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2020-10-31 12:27:46 +01:00
SkyratBot
27a8dbb042 [MIRROR] ZK-Lambda-Class Remade (#581)
* ZK-Lambda-Class Remade (#52941)

This PR adds the crystal invasion event, a new event involving the Supermatter and the monsters from within.
When the event starts there will be a message from centcomm announcing it, then the supermatter explode leaving a destabilized crystal that emits radiations and harmful gases; after a bit portals will spawn around the station, that will produce a number of monsters each. there are 4 types of waves and 4 types of portals
The waves are: Small, Medium, Big, Huge (each have different kind of portals that can spawn and different amounts too)
The portals are the same types of the waves, they differ from each other for the number of monsters that can spawn and the kind of monsters that can spawn (bigger portals spawn stronger monsters)
To end the event the players should stabilize the crystal by destroying the portals (for now are indestructible and they are disabled by using an anomaly neutralizer, might change that) and collecting otherworld crystals; then those crystals are to be put in the crystal stabilizer, an item unlockable in the tech tree. After this just inject the destabilized crystal with it and the remaining portals will close on their own (the spawned monsters will still remain tho so you have to slay them)

All the numbers are mostly eyeballed and could change if requested/with feedbacks

* ZK-Lambda-Class Remade

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2020-09-02 02:42:56 +02:00
SkyratBot
c023ec87e9 [MIRROR] New breathtaking medical stack: the mourning poultice! (#415)
* New breathtaking medical stack: the mourning poultice! (#52968)

New type of medical stack, obtainable from botany: the mourning poultice.

These poultices convert 10 brute and 10 burn into oxy per application, and can be used on corpses as well as the living.

It takes 20u bungotoxin, 20u aloe juice and 20u cellulose to create one stack.

I have split all the existing medical stacks into their own dmi, stacks_medical.dmi.

* New breathtaking medical stack: the mourning poultice!

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2020-08-19 19:57:28 -04:00
Ghilker
9532dbd2a8 Hydrogen Gas (#50510)
* new PR no tgui bundle build yet

* tgui bundle built

* atmos.dmi conflict fix 2

* balancing

* tgui bundle fix
2020-04-20 14:47:22 -03:00
Onule
c76519b6ce Titanium Resprite (#50454)
* Titanium Resprite

Resprites titanium walls, windows, floors, airlocks and sheet items.

* Fixes a visual error

Co-authored-by: Onule <Onuleee@gmail.com>
2020-04-20 02:11:11 +08:00
EOBGames
6653315d22 Codename Cheesy Goodness: New Material Datums (#49941)
About The Pull Request

Adds a slew of new material datums. Included are bronze, runed metal, sand (made from sand blocks, made by using sand on a sink), sandstone, snow, paper, cardboard, bone and bamboo. Oh, and pizza. Yes, pizza.
newmats
(from left to right: bronze, sandstone, sand, snow, bamboo, paper, cardboard, runed metal, and bone).

PIZZA
PIZZA!
Pizza is a special case: it's edible, and to craft it, you need pepperoni sheetzzas. These are made by using a rolling pin on a pizza slice.
Why It's Good For The Game

More mats datumised, and pizza is a good meme.
Changelog

🆑 EOBGames (Inept)
add: A whole bunch of materials are now datumised! Check out bronze, runed metal, sand, sandstone, snow, paper, cardboard, bone and bamboo. Oh, and pizza. Yes, pizza.
/🆑
2020-04-03 16:57:31 +13:00
Ghilker
22cf0dc785 Freon fixes, tweaks and balancing (#50153)
* balancing, fixes, tweaks

* freon specific_heat increase

* fix an issue with negative temperature

* changed HyperNob canister color

* done change request and tweaked more the hardcap limit
2020-03-28 21:31:35 +01:00
Ghilker
e7a22853f7 Addition of Freon (no removal, no fire) (#49821)
* Just freon addition, no removal nor fire. Maybe unbalanced

* fixes

* material properties addition, removed from the object itself

* added admin and game logging to hot ice

* Typos

* made the component more generic

* other typos, some fixes

* typos and balancing

* better code readability

* dunno

* merge error and travis build errors fixes

* asked changes, fixes and balancing
2020-03-20 19:08:50 -03:00
Tlaltecuhtli
404a26c74d aloe medical plant addition (#49444)
* 1

* 2

* removal of id and names

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* lowers price for med suture

* one aloe microwaved to 2 paste

* changes grind

* 🍆

* Update lavaland_surface_ash_walker1.dmm

* merg conflic

* ????????????

* Apply suggestions from code review

* reset travis

* reverts travis reset commit

cringe cringe cringe

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-11 11:54:41 -04:00
Qustinnus
4b2a8aebe5 [READY] Meat material & material datum turf support (#49402)
* temp

* meatwalls

* more

* adds sheetifier

* fix

* two

* mat texture + 4dplanner admin (#21)

* mat texture + 4dplanner admin

* keep together trait

* counter instead of trait

* finalizations

* woops

* fixes

* oopsie

* only set starting keep_together if necessary (#24)

* keep together as trait again

* remove false comment

* doc for TRAIT_KEEP_TOGETHER

* remove needless scoping

Co-authored-by: 4dplanner <3combined@gmail.com>
2020-03-04 23:18:08 +08:00
ArcaneMusic
e39eea7b17 [Ready] Adds a new RnD method, the B.E.P.I.S. (#48040)
* Squashes Commits, has BEPIS, Techs, TGUIs, Rewards, and fixes.

* Makes rewardable techs a variable in all_nodes, and removes RnD Points rewards from the minor reward pool.

* Fixes conflict with pubby and beam icon.

* Review comments and basic cleanup A

* Review Comments and basic cleanup B, also cleans up icon states to work fluidly.

* Map Update

* Indentation, flipped Update_decal_path, and rebuilds tgui

* One last clean up of icon_state, adds the last bit of changes from review, and that should be everything.

* Alright last change for real I swear 105%

* Last change, adds simple sanity check for silicons.

* Moved Human and card variables into ui_interact.

* Fixes map conflict

* Alright Review Round 2 Part A, Fixes Grammar, splits polycircuit into it's own file, UI QOL improvements, Withdrawing credits, changes from arbitary values on the mini RLD, etc.

* More review bits, Part 2:B. Easier returns for less processing, Defines, fixes the merge conflict and updates the UI with new buttons. Just need to figure out Button Mapping for the UI and Duplicate prevention.

* Implemented duplicate tech protection. Yeet.

* Get back in there you

* Alright why are you breaking on me god damnit.

* It's optimized, closer to god, nearly perfect, all together it's ready to ship.

* Cleans up all of the decal painter, shorter, cleaner, works around all the turf_decal quirks.

* Tab spacing on github will look fucky

* More review changes.

* Uses use_power == ACTIVE_POWER_USE instead of powered except for the UI
2019-12-25 23:48:28 +01:00
ArcaneMusic
9dd407924a Adds a new App for Modular Computers, the NTOS Arcade. (#47862)
Hey you, punk Are you hip with modular computers?
...What's that, you think there's nothing to do on that old tablet of yours? Whoah brochacho, don't dump that tablet in the trash, and check out the new gaming app that's sweeping the station!
2019-11-26 13:15:05 +02:00
Krysonism
59a0440acf Da white kit nerf update: sutures and regen mesh. (#47092)
* Base

* epic

* bandaid begone

* Documentation

* Bugmash

* Replaces bruise packs and ointment in on maps.

* Fixes for testmerge

* new line

* Dirty web

* Nasty webedit

* med suture is now a chemical recipe, adds cellulose reagent
2019-10-20 13:18:42 -04:00
Qustinnus
9812834054 Adds knight armour to the game that can be made from any material (#46301)
* Adds knight armour

* fixes armor

* nerfs & fixes

* adds ruin

* done

* bug

* oh im a buddy

* rad

* ok nem

* fix sprite

* fixes

* tgm

* epic

* re-adds icons

* fixes list

* ok ninja

* fixes

* fixed

* woops
2019-09-14 15:32:29 -04:00
Tlaltecuhtli
dab6944369 adds bamboo and fixes sugarcane (#44192)
* 1

* 2

* oh fuck

* kjhgfdfghj
2019-06-06 22:06:47 +12:00
fluffe9911
d78bb9152b Adds the golem Time-Green was too communistic to add (#42475)
* capitalism is the true way

* better sound clip

* there we go

* fixes mine and time-greens copy pasta

* adds the soviet golem to the human file

* capatalist golems now bleed money

* makes it so both capatlist and soviet golems can now use guns

* hec

* makes the song the U.S.A Anthem to please the copyright gods and removes money bleeding cause im to lazy to do a refactor right now

* Update code/modules/mob/living/carbon/human/species_types/golems.dm

Co-Authored-By: fluffe9911 <dablank02@hotmail.com>

* re

* better sound clip
2019-01-25 15:38:07 -05:00
Time-Green
b245f1ed5a Adds the golem Qustinnus was REALLY too afraid to add (#42402)
Stalinium is currently unavailable, so it's an admin only golem
cl Time-Green
rscadd: Adds glorious soviet Russia golem
/cl
2019-01-22 15:30:46 +13:00
Qustinnus
62f61a5867 [READY]New durathread content and durathread modifications (#41959)
* durayeet

* Update code/modules/clothing/head/jobs.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/head/beanie.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/masks/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/under/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* yeet

* adds armor

* webedits yeet

* adds crafting stuff and removes normal cloth crafting

* ff

* final fixes

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* done
2019-01-02 14:31:06 -05:00
MMMiracles
5ee8a6bb1f Adds clothing production for Botany (#40563)
cl MMMiracles
add: Botany can now grow cotton to produce cloth for various jumpsuits.
add: Cotton can be mutated into a much more durable strand, allowing for the production of crude armor.
add: Rainbow flowers, an alternative for clothing dyeing, is obtainable through cargo's exotic seed crate.
add: A loom can now be crafted with some planks so you can actually weave that cotton into a usable fabric.
add: Fannypacks, softcaps, beanies and scarves are now craftable with cloth and dyeable.
/cl

[why]: A way to produce clothing and naturally obtain cloth past ripping up other stuff seemed useful and with the economy aspect, might actually have some extra use.
2018-10-03 10:13:34 +13:00
Pigeons
12b5591411 Moves all sheet prefix sprite from mining.dmi to stack_objects.dmi and fixes a typo 2018-04-29 10:07:11 -05:00
ShizCalev
4b7297d576 Sheet icon fixes (#35772)
* Fixes sheet inhands

* Fixed transparency

* Ore fixes
2018-02-19 03:36:13 -05:00
uraniummeltdown
ac9964be70 Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-10 18:49:43 -05:00
bawhoppen
9b7f1ada6b Moves all stack object sprites from items_and_weapons.dmi to their own file (#31273)
* keeko

* forgot the file
2017-10-04 12:59:27 -04:00