Commit Graph

463 Commits

Author SHA1 Message Date
uomo
d5451ae60a Department, warning, and general sign code fix. And brand new custom plaques! (#50550)
* Oh God I hope this works...

* It didn't work.

* Making things better.

* Making things even better.

* That made things worse.

* Sorting works! \o/

* Tidying some thing ups.

* Adding a custom plaque to the game.

* Some plaque tweaks.

* Makes plaques more durable than signs.

* Adds the stack crafting.

* Plaques take a little time to engrave, signs can't be changed instantly anymore.

* Comments, and renamed the global list to avoid confusion.

* Appends "sign" to every name, makes department signs not all caps, fixes some names and descriptions.

* Touching up plaque customization and display, removing one last all caps.

* Plaques can now be engraved in hand too.

* Newline.

* Update code/game/objects/structures/customplaque.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/game/objects/structures/customplaque.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Mirroring some fixes from customplaque.dm

* A bunch of stuff.

* Unwrenched signs now lay horizontal.

* A lot more stuff, turned a negative variable into a positive.

* Fix chat inconsistency, remove deprecated and unused variable.

* Apparently buildable_sign is used elsewhere, whoops.

* Adding documentation to this, fixing a bool being 0 in another file.

* Don't know why this was here, sign dir is 100% irrelevant.

* Fixes some sound malarkey.

* Changes delays to be readable, removes unneeded return.

* Fixes these two early returns, it needed return TRUE at the end to work.

* Trying to fix a revert I messed up...

* Moving plaques to a directory, moving old sign plaque types into it. Map changes.

* Rename since I relocated this object entirely.

* Signs (and plaques) now properly place, and aren't visible through walls.

* Comment to help people in the future.

* Signs and plaques can be placed diagonally now.

* Removes duplicated code line.

* Blank signs now commonly spawn in maint, blank plaques uncommonly.

* Repairing signs & plaques with a welder is now good to go.

* Moves the GLOB, makes it start as an empty list.

* Update code/game/objects/structures/plaques/_plaques.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Gets rid of some oldcode.

* Apply suggestions from code review

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* Simplifying dir switch to two if elses.

* Plaques take one sheet of gold to graft instead of five.

* Just making this wording in crafting a little clearer.

* They can be removed with wrenches, so I don't think this is proper.

* Makes variables descriptive.

* More descriptive variables, a little dmdoc, move things around to be next to like things.

* Remove a redundant definition.

* Apply suggestions from code review

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Fixes mapping path, rename sign_backing to just sign.

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2020-04-28 01:43:44 -03: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
Fikou
a2de4d3546 you can now make shuttle seats with titanium (#50455)
* adds shuttle seats to titanium recipes

* shuttle seats now deconstruct into titanium
2020-04-20 02:07:29 +08:00
Ghilker
4449196201 Tiered canisters (#50330)
This PR will add 3 tiers (expandable) to the atmos canisters
Each tier will have a maximum temperature and pressure threshold that will cause the canister to burst if going over them.
How to build each tier

    Tier 1: With 5 metal sheets you make a canister frame tier 0 (similar way of the old canister making) and then you put 5 more metal sheets onto the frame (similar to when building windows on grilles) to finish it and build a tier 1 canister
    Tier 2: You first make the tier 0 canister frame, you put onto it 5 sheets of plasteel to make a tier 1 canister frame and you complete the tier 2 canister by using 5 sheets of titanium onto it
    Tier 3: Make a tier 0 and then a tier 1 canister frame like shown above, then you put 1 bluespace crystal onto the canister frame to make it tier 2 and complete it with plastitanium for a tier 3 canister.
    The maximum temperature and pressure that each canister can hold are:
    Tier 1 5000 K and 50000 kPa
    Tier 2 500000 K and 5e6 kPa
    Tier 3 1e12 K and 1e14 kPa
    All those are calculated based on a filled canister

The canisters won't instantly rupture when reached the temperature, instead they'll start to take damage (10, 5, 3 per tier for the time above the thresholds) untill rupture, so recovery is doable since the damage taken can be heard (is burn damage)
canister-tiers

Why It's Good For The Game

First there is more interaction between departments, then there is a stop to exploitable start round fusion and 50K bombs, since at least you have to wait for mining.
No more you can have the Sun heat inside of a normal canister.
Changelog

🆑
add: Added 3 tiers to the canisters
add: added canister frames (also tiered)
add: canisters rupture if there is too much pressure or heat inside (higher tiers have higher thresholds)
imageadd: added images for frames and overlays
/🆑
2020-04-18 11:20:57 +12: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
nemvar
f6bb710cc9 renames wet leather to wet hide (#50092) 2020-03-21 09:47:58 -03: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
ShizCalev
55f8dd7e35 Merge pull request #49940 from ArcaneMusic/quickfix
Fixes a few issues with datum tables.
2020-03-17 22:28:29 -04:00
ArcaneMusic
d276d08725 Fixes a few mat datum issues. 2020-03-13 23:41:32 -04:00
Bawhoppen
7f73fd2a7b Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-03-12 05:06:09 -05:00
Bokkie
69501ce8cb Smol fixes
Fixed some minor alignment/ orientation issues on the inhands of various sheets and adds a bit of missing code to the bronze tilesheets because it's parent is a tile instead of a sheet.
2020-03-09 01:15:24 +01:00
Bokkie
9d8eec7763 Second sheet inhand collection
added Plasteel, Plasma, Adamantine, Runite, Mythril, Alien alloy (shameless copy of the tile sprite) and Bamboo. Also changed all sheet sprites to be obstructed when your body is in front of it while you're facing north.
2020-03-09 01:15:24 +01:00
Bawhoppen
7bb27cf55e getting closer to being ready 2020-03-05 18:09:21 -06:00
ShizCalev
be18a622ca Merge pull request #49717 from Qustinnus/lmaowoopsie
you can actually make the hygienebot now
2020-03-05 15:48:33 -05:00
Bawhoppen
1f82ec544e Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-04 20:02:26 -06:00
Unknown
7a671a45cf 😏 2020-03-04 19:57:18 +01:00
AnturK
6735128e96 Fixes coal stack icons. 2020-03-04 19:02:42 +01: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
Bawhoppen
fd5f209863 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-02-27 17:12:47 -06:00
ArcaneMusic
59ff677b9d Initial Commit. (#49484) 2020-02-25 16:34:30 +01:00
Bawhoppen
e9864e1d88 fix1 2020-02-18 04:47:10 -06:00
Bawhoppen
fcf3ce223c shiv + laundry cart 2020-02-18 04:40:28 -06:00
Ryll-Ryll
1fae3d4c22 new beginnings 2020-02-18 02:06:35 -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
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
Fikou
c0b821e24e adds canvases to cloth recipes (#48952) 2020-01-24 11:25:44 -05:00
ArcaneMusic
b62d105228 Adds the Wood Datum Material, giving it to items made from wood. (#48820)
* Initial commit, wood datum mat. Works on my machine.

* Wait this makes baseball bats worthless nevermind

* Review changes, uses the define now, just don't know how bitflags work well enough for that other bit

* Adds the material dependance check

* FINE
2020-01-23 17:36:10 -05:00
AnturK
bc7ea709c5 Canvas Refactor (#48834)
* Canvas Refactor

* tgui review stuff
2020-01-19 11:14:05 -05:00
ArcaneMusic
65485b9c54 Adds a new Tech to the B.E.P.I.S., Specialized Engineering, and a new Minor Reward. (#48507)
About The Pull Request

Round 2.
image
Adds a new tech to be unlocked within the B.E.P.I.S.'s major techs, called "Specialized Engineering". Within that tech are 2 new items, Heat Resistant Rods, and the Tinker's Gloves, as well as a new minor tech, the Survival Pen.
Heat Resistant Rods:
Have you ever wanted to expand Lavaland Base? Build a lava fortress worthy of your magnificence? Well, now you can! Using Heat Resistant Rods, you can make a catwalk to cross lava tiles, as well as build atop lava, without messy methods like using the RCD!
Tinker's Gloves:
This just in engineers, insulated gloves have new competition in town! The Tinker's gloves are complicated, overdesigned gloves that, while not very shockproof, allow for faster wall girder construction. No longer will you need to die of old age walling off an area when you're out of RCD ammo! Warning: This product contains no likeness to clockwork gauntlets used by the extinct cult of Rat'Var, and any such similarity is by no means intentional.

Survival Pen:
Have you ever been stuck on lavaland, trapped by your survival pod with just a few chairs, some titanium walls, and walls of ash closing in on you? Well THANK GOD you have your Rockbreaker brand Survival Pen! Allows for basic mining operations, and is portable like a standard pen!
BUT WAIT!
A watcher blocks your path. Thankfully, your expensive, diamond encrusted pen isn't just good for being the world's slowest pickaxe, it's ALSO coated in the one thing watchers crave: DIAMONDS. Toss the pen to draw the watcher's attention elsewhere.
Why It's Good For The Game

Starts to fill our B.E.P.I.S. Major Reward Techs, as intended, and fills a niche that doesn't get much play nowadays: Building on Lavaland. This was something I've had in the back of my mind since we did the first tests of the Disaster gamemode a few months ago, so each item here was made with the intention of improving the mining base should the station become un-livable. Lava-Proof Rods are beneficial in that you'll be able to cross and build over lava by the mid-end of the shift. RCDs still work as usual, but this way you won't have to worry about getting specialized engineering equipment as a member of cargo or science. The tinker's gloves are basically a variant of the nitrile gloves, but they grant a speed bonus to adding plating to metal girders, so that some kind of functional alternative to giving every engineer insulated gloves.
Survival Pens are quite honestly very niche, but getting dumb pens with extra functionality is a tradition of trade shows all over the world, so it feels right at home as a minor reward.

Also, does a tiny change to the doe sprites, just to look a little bit less old.
Changelog

cl
add: A new Technology has been implemented as a major reward in the B.E.P.I.S., Specialized Engineering, to appeal to engineering utility and new construction horizons.
tweak: Watchers will now actively consume diamond ore left lying around, alongside the new survival pens.
/cl
2020-01-14 11:21:40 +13:00
nemvar
c15b2bb785 Fixes a bug that allowed the multiplication of materials. (#48584)
* No more double mats

* this isn't even a stack. I have been bambozeeled.

* Turns out the src. was important

* Alright this should work better.

* Alright this does work.
2020-01-05 19:44:27 -05:00
ShizCalev
ea56f83e58 Caltrop / glass / lightbulb crossing fixes 2020-01-03 04:47:06 -05:00
WarlockD
1db3834dcf Added construction bag recipe (#48410) 2019-12-31 19:59:13 +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
Fel
66114ec098 Mortar and Pestle Fixes (#48086) 2019-12-02 17:34:20 -05: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
ArcaneMusic
6e238392bf Adds several different uses for plastics (Cups, Utensils, Folding Chairs, Station Signs) (#47486)
* Initial PR, Cups, Utensils, Signs, Chairs

* Endline fixes for travis, adds plastic utensils to the initial node

* Makes bar invisible, addtimer added, fixes potential dmi/dm conflict

* Fixes Merge conflict take 2

* Wraps the chair snapping proc in invoke_async

* Cleans up Async Call a smidge
2019-11-02 20:30:35 +01:00
ArcaneMusic
f0f6b6e09b Adds plastic floors, floor tiles. (#47424)
* Adds plastic floors, floor tiles.

* Plastic tile version 2, Bluer, looks like a single sheet

* Plastic floors take 3, makes plastic floors weaker under heat than most other floortypes

* Fixes the ONE PIXEL, adds datum mat to turf for later use.

* Rebases floors, uses new file structure.

* Platic isn't a word
2019-10-30 19:29:24 -07:00
carlarctg
b49d3bb4ac hello (#47357) 2019-10-30 01:47:25 -07: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
81Denton
49589a9dee Merge pull request #46933 from Krysonism/Somethingforthekids
[READY]Da food update. Donuts! New foods! Nuggbox! Bowl resprite.
2019-10-20 14:55:35 +02:00
81Denton
1a0428f031 Fixes cult space bases (again) (#47041)
* Fixes cult space bases (again)

* h

* Fixes duplicate definition

* Lets cultists draw runes at the Lavaland cult altar ruin

* Adds CULT_PERMITTED_1 flag to check if cultists can summon/buld structures here

* h
2019-10-20 14:47:14 +02:00
Krysonism
52cccbeae8 Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>
2019-10-20 14:35:15 +02:00
DeAndre
a9b1ada28c Merge branch 'master' into Somethingforthekids 2019-10-20 13:26:13 +02:00
Fikou
d61384ce84 adds bronze windows and airlocks (#46921)
* bronze windows

* awoo

* badoom

* bronze airlock

* awoo

* nice

* oof
2019-10-18 20:11:27 -04:00
Firecage
8dad3bf7f5 Leather crafting menu can be used again. (#47103) 2019-10-17 11:03:08 +02:00
Tony
128cd843ee metal sheets build the normal metal table again (#47079) 2019-10-15 15:47:36 +02:00
KomradeSpectre
9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
Qustinnus
908ccfe7b3 Fixes some material datum bugs (#47049)
* fixes

* chair

* ass

* fixes

* dumb

* done

* fix
2019-10-14 00:36:56 -04:00
Rob Bailey
e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00