Commit Graph

150 Commits

Author SHA1 Message Date
carlarctg
b49d3bb4ac hello (#47357) 2019-10-30 01:47:25 -07:00
Arkatos1
0a4dcb5e00 Vendor dispense function changes (#47377)
* Dispense fix

* Finished and cleanup
2019-10-27 20:35:32 +01:00
carlarctg
fe65761c93 Candy cigarettes! + cig tweaks (#47143)
* Oh dude we got a fuckin coffee cheetos chickennnnnnnnnnnnn

* Update mask.dmi
2019-10-21 13:20:45 +11: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
MadoFrog
f63bb8bf5a Adds Shrine Maiden's Outfit to the Costume Vendor (#47090)
* Adds Shrine Maiden's Outfit

* Adds the Shrine Maiden's Wig

* Adds the gohei as a null rod transformation

* Gives the gohei purification properties

* Shrine maiden's items now lack religious significance

There's a profound comment to be made here, but I'm not smart enough to make it.

* Icons added back after rebase

* Addresses requested changes

* Adds the gohei's hitsound

* Update suit.dmi
2019-10-15 21:41:23 -04:00
kingofkosmos
228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm
2019-10-13 15:21:17 +03:00
moo
81becaf5d1 Cobbduceus: That girl is POISSSONNN (C2 Tox Chem changes) (#46823)
About The Pull Request & Why It's Good (Italics)

closes #46808
Seiver (NEW, replaces Fiziver)

Fiziver has been removed in favor of a new chem, Seiver.

Seiver is a chem that focuses on radiation purging or antitoxin depending on the temperature (the holder temp, not the air temperature). Colder temps will purge rads while hotter temps will clear up your sinuses toxin! Does heart damage relative to healing done.

Fiziver didn't see much use and I grew to dislike the overall damage mods. I think this is more interesting anyways since you have to play with chemtemp, something that adds a bit more depth to the chem. You may even need to add buffer chems that are cold to retain the high healing thresholds.
Multiver

Multiver is now geared heavily towards toxpurging. It now purges non-toxins less and stops purging medicines completely while you have at least 5 unique meds (including multiver) in you.

Multiver no longer self purges

Multiver's C2 mechanic is scaled down for each unique medicine (more unique meds makes it less bad for lungs!).

Multiver's toxhealing is lowered to 0.1 per unique medicine.

I wanted multiver to compete with syrinver since it wasn't used often but also not justify an arms race, so I decided to give them unique roles. Multiver is now more oriented for chem-purging while syrin is geared towards pure tox-healing so they should both find themselves in the smart doctor's arsenal.
Syriniver

Lowered the chem-purging for syriniver, with musiver having an even lower purging mechanic. They are also less selective, purging everything (syrin will not purge itself but musiv will).

see multiver
Changelog

cl Toxicby
add: Seiver, a chem favoring radpurging (cold temps) or antitoxin (hot temps) based on temperature (NOTE: NOT ATMOS TEMP)
del: Fiziver is now removed in favore of Seiver. Seiver uses old Fiziver recipe.
balance: Multiver is now geared towards chem-purging, and the unique-med mechanic is more rewarding than just amplifying the effects. Lowered toxin damage.
balance: Syriniver is now geared towards tox-healing. Lowered chem-purging and make it nondiscriminatory barring itself. Musiver has even lower chem-purging and is completely nondiscriminatory.
balance: 2 multiver bottles in the Medivend were replaced with syriniver since they now have more distinct functionalities.
/cl
2019-10-13 16:49:00 +13:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03: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
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Fikou
05f0c2c1f3 adds the GRILL (#46844)
* a

* GRILL GANG

* sipp

* sip

* seep

* grug

* FSAIUGANOHNHOE

* bru

* a

* finish him

* compilies ^w^

* WOOO

* holy crap

* woo

* a

* h

* woo

* woo

* woo

* awoo

* aa

* aw shet

* heck you floyd

* at ath

* awo

* we like compiling code

* awo

* coal mat

* awoo

* aasdga

* a

* nice

* awoo

* awwoooooooooooooooooooooooo

* awoo

* spaceport bars

* grill gang

* aw

* awooo

* yee

* aw

* flod

* awoo

* awoo

* yesyesyyes

* a

* awoo

* holy sht

* h

* awoo

* awo

* aaaaaaaaa

* awoooooooooo

* awoo

* aw man

* honk

* well boys we did it

* oh mama mia

* ok cobby flushed

* awoo

* removes fun

* yeep

* i just said something

* vruh obama

* ye

* awoo

* awooooooo
2019-10-05 13:40:40 -04:00
Kerbin-Fiber
950e8d7172 Station Donksoft Vendor Resprite (#46776) 2019-10-04 14:19:49 -04:00
cynic716
36d4ef4788 Adds a sound to vending machines when they vend something (#46843) 2019-10-03 23:59:56 +02:00
spookydonut
82504aee09 Adds linting for power_change() and obj_break() (#46608)
Adds linting for power_change() and obj_break()
2019-09-26 05:09:49 -07:00
Tlaltecuhtli
62cc2abb2d more vending fix (#46538)
* Update maps.txt

* small vendor fixes

* Update _vending.dm
2019-09-25 15:32:50 +02:00
spookydonut
860985f193 Changes obj_break on machines to use parent calls (#46485)
The way stat |= BROKEN was done was a mess, this makes everywhere use obj_break with proper parent calls and adds a signal for when a machine enters the broken state.
Why It's Good For The Game

Better code quality, more signals.
2019-09-16 16:45:24 +12:00
Krysonism
4514a98633 The gambling anticipation update. D6 resprite and more! (#46471)
About The Pull Request

This PR resprites the D6, adds two money bags and a bag of 5 d6'es to the bardrobe. Be on the look out for the expensive ebony dice.

I have also made code improvement by filling dice bags using PopulateContents() and giving the special dice their own loot spawner.
Why It's Good For The Game

I have recently in anticipation for the roulette update tried playing some simple dice games with my bar patrons to great success. I did however notice that the old d6 sprites were quite bad, so i decided it was time for a resprite,

I have also added money bags to the BarDrobe since those will be needed if more forms of gambling are added to prevent greytiders from stealing all your winnings.

DiceComparasion
EbonyDiceLarge
Changelog

cl
add: Money bags can now be obtained from the BarDrobe.
add: A bag of d6'es is now available in the BarDrone. May contain a rare die.
imageadd: New d6 base sprites and variant.
refactor: Improved the way the normal dice bags is populated.
/cl
2019-09-16 16:43:20 +12:00
Trilbyspaceclone
b8208fac37 [Ready] More cakes and pies, as well as resprites a few others (#46196)
About The Pull Request

Adds in more tarts - pies
Mime Tart, Lava Coco flow Tart, berry tart
Adds in a few more cakes
Vanilla cake - real this time
Clown cake - Honk!
New book only get able via Dinner-o-mat that teaches you how to makes these
Why It's Good For The Game

More colorful foods and crafting as well as using the locked crafting system - Maybe better looking cakes
2019-09-09 10:59:28 +12:00
Tlaltecuhtli
11024a6c74 Fix loading into the custom vending machine (#46351) 2019-09-06 21:32:32 -07:00
Tlaltecuhtli
39d3948f4d Custom Vendor Re-PR (#45736 Re-PR) (#46240)
* Update maps.txt

* 1

* 2

* designs

* oops

* ((()))

* 3

* rename with pen

* sprites+ vendomat changes

* sanized input

* Update _vending.dm

* adds admin custom vendor

* Update _vending.dm

* Update _vending.dm

* Update _vending.dm

* Update _vending.dm

* Update maps.txt

* Update device.dmi

* Update maps.txt
2019-09-03 00:22:41 -04:00
Mickyan
93c2dc0c23 [READY]Skateboard overhaul (#45657)
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
2019-08-24 21:07:26 +02:00
ATH1909
98c1ad73ac Moves the robotic voiceboxes from one of my previous PRs over to the RoboDrobe (#46076)
* Update heal.dm

* Update heal.dm

* Update fire.dm

* Update plushes.dm

* Update plushes.dm

* Update fire.dm

* Update plushes.dm

* Update robotics.dm

* Update wardrobes.dm

* Update robotics.dm

* Update wardrobes.dm
2019-08-23 16:32:46 -07:00
moo
74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
Mickyan
a5b04e360c Adds more persistent photo albums (#45898)
* album

* more slots

* new icon for old photos
2019-08-17 00:42:58 -07:00
ATH1909
b1449e7898 Adds robotic voiceboxes as contraband in the Robotech Deluxe (#45747)
Adds robotic voiceboxes as contraband in the Robotech Deluxe
2019-08-09 18:51:49 -07:00
Tad Hardesty
009dbfc7cc Fix broken suits in medical outfit lockers (#45695)
* Fix broken suits in medical outfit lockers

* More dumb ass fixes
2019-08-05 18:57:35 -07:00
nemvar
e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
Farquaar
28b2200366 Adds monk robes to chaplain drobe (#45663)
About The Pull Request

Allows players to obtain monk's frocks and eastern monk's robes from the chaplain vendordrobe.
Why It's Good For The Game

Now that Garen7 has fixed the monk's frock's hood toggle (#45595), it seems only natural that it should be in the chaplain's vendordrobe. Also, the eastern monk's robe wasn't available there either, so this rectifies that issue.
Changelog

cl
tweak: Crewmembers can now obtain monk's frocks and eastern monk's robes from the vendordrobe.
/cl
2019-08-04 09:37:47 +12:00
Rob Bailey
8b9f3cd16d Revert "E (#45475)" (#45552)
Reverts #45475

I thought that this was a jumpsuit sprite that apparently doesn't even exit. Mandela Effect is real, and I transported to a different dimension where everything is the same except that the tie die jumpsuit I was thinking of doesn't exist and there's an obnoxious strobing jumpsuit in its place.

The sprite that this actually is is incredibly obnoxious and should either be stupid expensive or just not in it, so clicking one button is much easier.
2019-08-03 14:50:56 +12:00
SpacePrius
361bbd3e73 Sec vendor on gulag now has ID and Cost requirements (#45466)
* makes it so the sec vendor actually works on gulag

Signed-off-by: Space Prius <bubba041102@gmail.com>

* lets see if this fixes it

Signed-off-by: Space Prius <bubba041102@gmail.com>

* minor changes.

Signed-off-by: Space Prius <bubba041102@gmail.com>

* modifying logic

Signed-off-by: Space Prius <bubba041102@gmail.com>
2019-08-02 17:05:38 -07:00
Rob Bailey
6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
tralezab
e94b6139cf Fixes some issues with balloons (#45554)
* Ok, this was just embarrassing

* uno

* dos

* tres

* cuatro

* wait, these vending machines are crazy similar...?
2019-07-29 18:51:41 -07:00
loser
9b9e846ebc E (#45475) 2019-07-27 20:18:10 -07:00
nervere
d9abd3930a adds jojo hat (#45451) 2019-07-26 17:42:56 -07:00
oranges
d65de92ed1 Autodoc the vending machine (#45468)
* Autodoc the vending machine

* Update code/modules/vending/_vending.dm

Co-Authored-By: Tad Hardesty <tad@platymuus.com>
2019-07-26 03:00:43 -07:00
Qustinnus
c80185421f Adds techpriest robes and adds them to the RoboDrobe (#45365)
* start

* techpriest

* contraband

* ass
2019-07-24 03:35:38 -07:00
Twaticus
2b4c123fc0 Skirt Update (#45244)
About The Pull Request

Some skirt sprites were offset i dont know how this happened i swear i fixed this before but apparently not. Fixed the assistant skirt necklines being way too high. Added extra details on some skirts.
Added 5 previously missing skirts including 2 lawyers skirts(like they dont have enough already), rainbow, syndicate and tacticool. Fixed the disorganized mess that was the Lawdrobe.
Why It's Good For The Game

Updated skirts good. Rainbow skirt good. Skirtleneck good.
Changelog

cl
add: The long lost rainbow jumpskirt has been found
add: Rumor has it that even the syndicate have started producing skirts for their operatives
tweak: Department skirt necklines are more in-line with their jumpsuit counterparts, sprites are no longer offset, added detail
/cl
2019-07-19 22:39:41 +12:00
cacogen
9da79d3c4a adds extra equipment to the janitor's wardrobe for a second janitor (or assistant) 2019-07-06 14:59:31 +12:00
Krysonism
1edc7fb582 Add cowboy boots! (#44880)
This PR adds 6 new types of cowboy boots. Brown, black and white
cowboy boots have been added to the clothesmate. Two types of lizard
skin boots can be crafted, these boots can then be exported for money.
An additional pair of fancy boots are currently unobtainable, but will
be part of a future project. Cowboy boots can now act as shelter for
some type of snakelike creatures, fill a pair with snakes as a prank
or harebrained assassination plot.
2019-07-05 12:08:22 -07:00
Krysonism
ffe578aacb [READY]Replaces Trekchems with Cobby Category 2 Chems + Chem Tweaks (#44531)
* Adds adjustLiverLoss & getLiverLoss procs to carbon

* Adds trophazole

Adds trophazole, a brute healer that makes doctors take a more holistic approach to heal, It is highly reagent efficient by converting nutriment to healing peptides. Creates an avenue for cooperation between kitchen and  medbay.

* Adds rhigoxane

Rhigoxane is a chilly burn healer that works best in a spray bottle and is capable of extinguishing fires.

* Adds thializid

This tox healer has great potential and mixability, balanced by requiring the doctor to take note of the patients liver health as well as using proper dilution and an iv pole; that wont fit in a powergamers pocket.

* Charcoal  + trans_to changes

Makes charcoal only work when ingested, and adds a new proc in reagent holder, lets trans_to react the transferred reagents if a method is chosen.

* Medical + Syndicate spray bottles

Medical spray bottles have been added to techweb under the biotech node for medical vapor application, alt click to change their skin.
Two suspicious spray bottles have been added as expensive contraband items in the chemdrobe. They have one extra spray range and a random suspicious skin from a pool of 8.
The large spray bottle and the space cleaner bottle also have new icons.
In addition trophazole and MMF have new colors.

* Adds chempacks

the IV medicine bag, or chem pack is the blood pack analogue for chems, it is easy to fill like a beaker but can also be permanently sealed to prevent spillage and mitigate tampering. It can be renamed with a pen. Both the new chem pack and the old blood pack have been added to the medical lathe and biotech node.

* Adds recipes to thializid and trophazole

Also fixes the rhigoxane recipe

* Medsprays are now medigels + fixes

chem packs can now be stored in the smartfridge and chem bag.

Medsprays were renamed medigels to reduce confusion. Calling them medical sprays made no sense since they apply chems through the patch method. 

The lore for the new medigels  is that they spray a thick gel onto the skin that dries into a film.

* minor fixes + mint frosting

I have tried to fix the problems people have pointed out. And the peptides now taste like mint frosting.

* Readds my cleaner sprites

* Adds liver damage to thializid + adds on_transfer proc

Thializid has a liver cost, the cost is worse if you have already sustained liver damage. Fixes weirdness by moving the reagent conversion effects from reaction_mob to on_transfer

* Fixes chem bag examine

The chem bag examine now werks, also fixed a typo in the description.

* Adds a clumsy check to sealing the chem pack

* Makes kelo, bicard and anti-tox unmixable.

I have retained the tricord recipe for now in case someone manages to collect all 3 through non-dispenser means. Think of it like collecting all the dragon balls but lame.

* Makes damp rag apply on_transfer effects

* glass and food now work with trophazole

glasses and food now call the on_transfer proc via trans_to

* Another round of fixes

Replaces 0/1 values with TRUE/FALSE where appropriate. Removes the debug printout from the spray bottle reskin. Replaces one instance of L.damage with C.GetLiverLoss().

* Rhigoxane recipe is now COOLER

200k was too warm since cryostylane cools down so much by itself upon mixing. 
Now the chemist has to choose between adding oxygen for instant cooling or using the heater/cooler to conserve energy.

* Removes the seal() proc and moves its guts into AltClick

* Item_state switching moved to reskin_obj

* Fixes missing medical sprayer left inhand

the sprayer_med_yellow inhand sprite now has the correct name.

* Fixes inhand updating

* Update code/modules/mob/living/carbon/damage_procs.dm

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

* Update code/modules/mob/living/carbon/damage_procs.dm

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

* Tries to add typecache

* Moves the typecache and makes it static
2019-07-05 09:50:59 -04:00
ShizCalev
6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
Krysonism
e5d5cef356 Move the player's selection items to the top (#44868)
The chef's compartment and any future compartments of this type are
moved to the top of the interface.

It is time to unleash the awesome power of the free market and
cultivate a spirit of entrepreneurship. By placing the chef's
compartment on top of the subsidized swill provided by tyrannical
pseudo-governmental entity know as Nanotrasen, we can promote the
commerce of those possessing a mind undulled by the poison known as
socialism. God Bless the USA
2019-06-29 15:17:17 -07:00
Twaticus
0cd4ca69a5 Department Skirts (#44776)
About The Pull Request

Adds department skirts to all related lockers/vendors

Why It's Good For The Game

Skirts good
Changelog

cl
add: added department skirts
fix: fixed secskirt dixel
/cl
2019-06-29 21:01:44 +12:00
kingofkosmos
c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
kingofkosmos
ebf787a97a * "You should..." and "You must..." 2019-06-26 06:13:32 +03:00
Mickyan
b6782cea8c dish drive 2019-06-23 03:03:49 +02:00
Tlaltecuhtli
7219be4c92 fixes an issue with refills #44620
cl
fix: refill for autodrobe and BODA work
/cl
2019-06-22 10:45:43 +12:00
Rob Bailey
65e9888fa6 [READY] Smart Cables (#44265)
Cables now autoconnect on cardinal directions. All cable placement has been completely stripped out and replaced with simple single cable per tile logic.
Low effort demo: https://www.youtube.com/watch?v=fXp8s6ORWbA
Yes I am aware that cutting it is not dropping wire, that version was bugged.
Cables no longer need a knot specifically placed to link to power objects. The sprite is automatically changed to represent this.
The only exception to this logic is that on smes units, due to the terminal being next to the output, they will not link there.
On a technical powernet side, this is the same as old cables once actually placed. They still use the existing powernet system, just the placement and connection works differently.

Old cables have been turned into "pipe cleaners" for wire art purposes. they work just like the old ones, just missing all the powernet functionality, and also you can put them on top of the floor.
Why It's Good For The Game

How obnoxious cables were to both map and work with in game has been something that has annoyed me for a really long time now.
This is both easier for new players to learn, and easier for experienced players to work with.
Along with making in game much more intuitive and easier, it makes mapping much easier as well. Mad lad wjohn was able to rip out all the mapping conversion in one day because of how much faster it is to work with.

cl actioninja and wjohn
add: Cables have been completely reworked. Simple per tile connection logic, automatically connects to things above it. Think minecraft redstone.
add: Old cables have been kept as pipe cleaner. They are non-functional in terms of power, but otherwise have the same connection logic. Also can go on top of tiles.
remove: mech cable layer has been removed because it was terrible shitcode nobody used
tweak: (sort of balance) cable stack sized has been reduced to 15.
/cl
2019-06-22 10:24:37 +12:00
bgobandit
893b020228 Some spelling and text changes. (#44426)
* fixes some spelling

* Spelling changes, immersion changes, text changes in general

* Update code/datums/mutations/body.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-06-11 14:36:56 +02:00
AnturK
e0824114db Adds hourglass (#44384)
* Adds hourglass

* Proper icon and animation.

* Makes throwing not break animate.

* Adds hourglass to library game vendor.
2019-06-10 10:31:24 +12:00