Commit Graph

23 Commits

Author SHA1 Message Date
SkyratBot
5359878eac [MIRROR] Nice, Corgi Pinning Action for the whole family. (#1077)
* Nice, Corgi Pinning Action for the whole family. (#53913)

Adds pin the tail on the corgi, a basic party game last seen at the summer ball, that I had lying around on one of my branches since then. The corgi is a poster that functions like most other posters, but has an interaction with the fake "Corgi tail" object, which can be pinned onto the poster to visually place the tail onto the poster.

Are you a bad enough dude to pin the tail on the corgi blindfolded?

Fun, cheap entertainment. Might make for a cheap thrill, or help set the scene of a birthday party. Works as a very player driven basic activity.

Also, the tail pins are harmless embeds. I'll leave that here for you to think about.

* Nice, Corgi Pinning Action for the whole family.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-09-30 14:17:11 +02:00
SkyratBot
b483bfd968 [MIRROR] Adds sound selection to certain instruments (#996)
* Adds sound selection to certain instruments (#53690)

This gives instruments a selection of fitting instrument sounds, since we have a bunch that have been exclusive to the synth piano until now. For example, the harmonica can pick between the hardcoded and synthetized versions.

It might also add a new special and rare instrument

* Adds sound selection to certain instruments

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
2020-09-26 16:22:03 +02:00
SkyratBot
d09940bcac [MIRROR] Adds rollerskates, wheely can do tricks (#751)
* Adds rollerskates, wheely can do tricks (#53497)

This turns wheelys into a skateboard subtype so they are no longer a copy paste of old skateboard code. They have lower stability compared to skateboards.
I've also made a whole bunch of small adjustments in the process to make skateboard code cleaner and more modular, such as turning the improvised skateboard to its own subtype so that construction steps don't need to be overwritten for all subtypes

Adds two subtypes of wheelys:
-Rollerskates: more stable than wheelys but slow you down when the wheels are retracted
-Skishoes: For skiing! Only work on snow, obviously

I wanted to add some fun alternatives to skateboards with their own drawbacks, and the ski shoes were an opportunity to do something fun for icemoon maps

* Adds rollerskates, wheely can do tricks

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
2020-09-11 23:18:39 +02:00
SkyratBot
b25aea057b [MIRROR] adds lightbulb removing skillchip (#215)
* adds lightbulb removing skillchip (#52603)

* shawty got low low low low low low

* Update code/modules/library/skill_learning/skillchip.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* aaagh

* fuck

* review

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* adds lightbulb removing skillchip

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-08-07 01:37:33 +01:00
SkyratBot
681c1e26bd [MIRROR] Adds useless skillchip adapter (#145)
* Adds useless skillchip adapter (#52577)

* Adds useless skillchip adaptor

* Redo code so that skill_station code doesn't need to be modifed

* Remove helper and return directly instead of setting return code

* Update code/modules/library/skill_learning/skillchip.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Change to bitflag system

Co-authored-by: Rohesie <rohesie@gmail.com>

* Adds useless skillchip adapter

Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-31 00:36:13 +02:00
AnturK
1f5e905c0d Simple skill/skillchip framework (#52314)
* Simple skills framework.

* Map changes.

* Adds skillchips to vendor

* Adds skill stations to the map.

* Circuitboards

* Fix typo

* Some minimal instability

* Fixes,tweaks etc

* Suggest better names or we'll end up with these.

* sharpness thing

* tgui build

* Makes wine from booze synthetizer show to wine tasters.

* Makes wine from dispenser have taste for wine tasters.

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Swaps to carbon var.

* wordy helper proc

* While i'm at it, other relaymoves

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 04:14:10 -04:00
EOBGames
c81fb830b3 nice (#51446) 2020-06-10 23:13:39 +02:00
EOBGames
961513f59c Codename: Jeu Tarot- Tarot Cards, for games and divination, risen like a phoenix (#51318)
About The Pull Request

Re-PR of #51027 due to a git hiccup.
Adds tarot cards, for business and pleasure. The tarot deck consists of 78 cards, split into 56 Minor Arcana cards (each suit consists of 10 number cards, and 4 face cards) and 22 Major Arcana cards. The deck has new art:
minorarcana
majorarcana
Special thanks to Fikou for deciding which jobs should correspond to each of the Major Arcana.
Why It's Good For The Game

It's a fun distraction from the dull humdrum of station life, and opens up some good RP opportunities.
Changelog

cl Inept
add: The Nanotrasen Entertainment Division has released a new product: Tarot cards! They're available from the Fun vendor for all your divination needs.
/cl
2020-06-09 15:57:23 +12:00
EOBGames
22ed61f2e9 [READY] Codename: Blue Eyes White Jumpsuit, the TG TCG, Part 1, Reborn (#51252)
* here goes nothing

no really this is basically nothing

* dme is less dumb

* aaaaa string files

* Card backend (#3)

* Adds card backend and hotloading

This is a combination of 2 commits.

OH SHIT THE SM IS ON FIRE

WE DONE LADS

* Woop

* Best we'll get

* fixed file system, courtesy of potato

* updated tools (thanks potato), now up to 40 cards

* Adds rarity (#4)

* Adds rarity

* just to be sure

* Adds it to cards

* Didn't read templates WHAT A NERD AMAROIGHT

* Commets

* Woop you'd think I'd know my own system

* There we go

* Fuck you EOF (#5)

* Makes rarity not suck (#6)

* Fuck you EOF

* Makes rarity not suck

* Auto stash before merge of "blueeyedwhitejumpsuit" and "origin/blueeyedwhitejumpsuit"

* Makes rarity work as expected, thanks dogman (#7)

* smolcards

* Adds datum cards (#8)

* Datum cards

* Some docs and a little bit of cleanup

* fuck

* problems be had

* Fuck (#9)

* fucko bungo RELASE ME FROM THIS HELL GIT

* datum FUCKING AHHHHHHHHHHH

* packs and games

* boomer mood (#10)

* Card debugging (#11)

* Adds debug vars

* that's a bit better

* shit

* unfucks rarity

* scales sorted

* That should do it

* Parity

* fun fact

* series 1 json

* and so it is done

* Don't need this, I'm dumb.

MacRo-Op???@?#?@??!#?!@

* BRAINDAMAGE

* resin redux, smaller cards

* shut up shut up shut up IT'S ASSUMED TYPE OK? *it's not all that bad*

* double rarity TABLELS, fixed the silly linter

* flippers and rarities

* guaranteed rarity, rarity tables

* fuck it let's ask

* resinfront

* 2560 core set

* fixes flippers

* template icon, extra variable juice

* ADDS SPEED (#12)

* FUCK FUCK FUCK SHIT I BROKE IT AGAIN

* Kills my dreams in the NAME OF SPEED

* and some cleanup

* Minor changes, some qol (#13)

* couple small changes, moved the datum procs around to make things cleaner, made some comments autodocced

* Let's be more clear,

* and a woooop

* Removing ids, carpel tunnel edittion (#14)

* Subsystem

* Carpel tunnel completed

* woop

* curator is no longer equipment

* I'm not dumb you're dumb (#15)

* minor rarity tweak

ladies and gents, it's finished

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-06-01 22:50:07 -03:00
TiviPlus
8bf449ca67 Ports Not-Uno and changes card stacks (#50357)
* I GOT MINE ON DAY ONE

* I have the oldest xbox known to man

* e

* whee

* shits broke

* lol

* Update code/game/objects/items/toys.dm

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

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-04-06 19:39:04 -04:00
Rob Bailey
2f127f8b95 More glowing stuff (#50109)
* vending machine framework

* wip

* all vending masks

* more glowing stuff

* dynamic unsetting of luminosity

* use define
2020-03-22 23:38:50 -03:00
Mickyan
0b3e1b524a Functional headphones (#48908)
* headphones

* adds element for mob icon updates

* corrects some "user" errors, literally

* now using signals

* removes extra space
2020-02-13 16:38:15 +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
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
Mickyan
a5b04e360c Adds more persistent photo albums (#45898)
* album

* more slots

* new icon for old photos
2019-08-17 00:42:58 -07: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
bgobandit
d0b10b50a5 Fixes Cards Against Spess and refreshes cards. (#44158)
* Fixes CAS and refreshes cards.

* fixes for loops, adds more cards

* fixes bug, adjusts prices
2019-05-28 01:55:40 -04:00
Tlaltecuhtli
fde4c92638 fixes vending machines not having refill parts (#43314)
* 1

* 2
2019-03-28 01:55:50 -04:00
Iamgoofball
f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Tad Hardesty
870ac15480 Improve how vending machine restocking works 2018-06-16 23:02:41 -07:00
John Ginnane
3e1db725c1 Modularises vending machines (#36508)
* Modularises vending machines

Each machine now has its own file, which includes it's refill cannister for easy maintenance

* Moved and renamed vending file
2018-03-21 16:33:39 -04:00