Commit Graph

762 Commits

Author SHA1 Message Date
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
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
Qustinnus 2a1c921acb Refactors skill modifiers to use dictionaries (#48572)
* adds dictionaries woo

* fixes bad code

* duh
2020-01-05 19:46:25 -05: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
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
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
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
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
AnturK 994641ce45 Fixes mindless monkeys trying to use sutures. (#48101) 2019-12-07 00:10:21 +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 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
ShizCalev fdda63350a Merge pull request #47888 from zxaber/splitting_hairs
Fixes mat stack splitting taking two many material units from the parent stack
2019-11-21 00:10:05 -05:00
moo 964b3d65d5 Cobbduceus: Healing lvl? (Medical Skill) (#47538)
* b

* helps to commit huh

* math is hard

* parenthesis are even harder

* Update code/datums/skills/_skill.dm

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

* removes efficiency... or efficacy 😏

* baby sha... i mean files
2019-11-21 04:49:24 +00:00
Zxaber 79281c04b0 oops 2019-11-19 11:13:21 -08:00
Zxaber 58f9a82020 Wait, this is better in the use proc 2019-11-17 22:35:06 -08:00
Zxaber d0d5a2adfb more fix 2019-11-17 22:29:23 -08:00
Zxaber 1d3847d5e5 Fixed 2019-11-17 20:04:29 -08:00
spookydonut 2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08: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 678ff60bbd You've got to go back. (#47269) 2019-10-23 20:41:57 +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
81Denton f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02: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
moo 940606a239 Adds new bioluminescent traits and mutations (#46986)
* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.
2019-10-18 19:49:24 -04:00
Qustinnus 472dd167ac fixes orm not giving mats and rods not having mats (#47163)
* o ok

* ok
2019-10-18 19:19:59 +02:00
Firecage 8dad3bf7f5 Leather crafting menu can be used again. (#47103) 2019-10-17 11:03:08 +02:00
kingofkosmos 52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03: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
kingofkosmos 259626a8b4 Removes excess spaces in messages. 2019-10-13 14:36:43 +03: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
nianjiilical 434bba9775 Adds new bioluminescent traits and mutations
Because 'puke green' shouldn't be the only light color.
2019-10-10 18:05:01 -03:00
Qustinnus 270f73671e fixes mats (#46994) 2019-10-09 20:10:55 +02:00
Urumasi 6e7801550b Moves reagent fill code and adds caps to plastic water bottles (#46878)
* Adds caps to plastic bottles

* Non-crafted water bottles now spawned closed

* Added warning message for closed bottles, fixed minor bug

* meme

* Makes the warning only show up when doing valid actions with the bottle

* Clumsy people now have a chance to lose the cap

* Fix small bottle's cap when fallen over, bottles now turn upright when opened on the floor

* Add a minor positive moodlet on bottle flip

* Adds a relic lavaland water bottle that always lands upright

* Moves container fill overlay to reagent_containers, changes glass/beaker/waterbottle to glass/waterbottle

* Make actions with closed cap early return

* Minor code cleanup
2019-10-09 12:05:52 -04:00
William Wallace 8221f6de87 remove duplicate var definition in /obj/item/stack/sheet/paperframes 2019-10-08 23:20:33 +01:00