Commit Graph

166 Commits

Author SHA1 Message Date
EOBGames
b08632353c [MDB IGNORE] Eliminates Toxins (#60619)
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.

Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.

Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.

Makes the code more legible and makes mapping less painful.

(The payment has been made)
2021-08-17 11:49:47 -07:00
Wayland-Smithy
be73916ced Fixes edible rabbit eggs (#60796)
Fixed chocolate surprise easter eggs being edible before they are unwrapped and tasting like egg.
2021-08-11 22:50:23 -03:00
Rohesie
4c21166e4f Job refactor: strings to references and typepaths (#59841)
* Job refactor: strings to references and typepaths
2021-07-18 20:48:47 +02:00
Fikou
e0699c1940 Add to moth week holiday: teleporter accidents make you moths (#60284) 2021-07-18 09:44:29 +01:00
Rohesie
2c5a357035 Reverts Entered() passing dir instead of old loc (#59910) 2021-07-01 17:06:42 -07:00
Fikou
24549d707b Toy Update (#59754)
* code

* sprite part 1

* sprites and mapping

* wa

* fix

* warden figure fix

* warden fix 2

* wahwah

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

* series

Co-authored-by: tralezab <spamqetuo2@gmail.com>
2021-06-22 00:17:26 -07:00
Rohesie
e03cd1aada Refactors move procs to support multitle objects (#59658)
Enter(), Entered(), Exit() and Exited() all passed the old loc forward, but everything except a single a case cared about the direction of the movement more than about the specific source.
Since moving multi-tile objects will have multiple sources of movement but a single direction, this change makes it easier to track their movement.

Cleaned up a lot of code around and made proc inputs compatible.

I'll add opacity support for multi-tile objects in a different PR after this is merged, as this has grown large enough and I don't want to compromise the reviewability.

Tested this locally and as expected it didn't impair movement nor produced any runtimes.
2021-06-20 14:55:37 -07:00
Watermelon914
375a20e49b Refactors most spans into span procs (#59645)
Converts most spans into span procs. Mostly used regex for this and sorted out any compile time errors afterwards so there could be some bugs.
Was initially going to do defines, but ninja said to make it into a proc, and if there's any overhead, they can easily be changed to defines.

Makes it easier to control the formatting and prevents typos when creating spans as it'll runtime if you misspell instead of silently failing.
Reduces the code you need to write when writing spans, as you don't need to close the span as that's automatically handled by the proc.

(Note from Lemon: This should be converted to defines once we update the minimum version to 514. Didn't do it now because byond pain and such)
2021-06-14 13:03:53 -07:00
EOBGames
d4e7af1481 Add new Holidays: The Great War, D&D, and Species Celebrations (#59370)
Adds some new holidays.

    Remembrance Day is self explanatory, and falls on November 11th.
    UN Day is on the anniversary of the foundation of the UN, October 24th.
    Wizards Day is on Gary Gygax's birthday, July 27th.
    Tiziran Unification Day falls on September 1st, and is the date on which Lizards were made a roundstart race.
    The Festival of Atrakor's Might falls on June 15th, and is the date on which the Lizard visual overhaul was merged, bringing horns, frills, and spines to make lizards less bland.
    Draconic Day falls on May 3rd, and is the date on which the Draconic language was merged, heralding the rise of the Lizard metagangs (or not).
    Fleet Day is the Moths' special day, falling on Jan 19th which is the date on which Moths were merged.
    Finally, the Festival of Holy Lights is the Ethereal holiday, falling on Nov 28th, the date on which Ethereals were merged.
2021-05-31 10:19:18 +01:00
Mothblocks
356cd53952 Pride week + rainbow floor tiles (#59250)
Adds pride week from June 23rd to the 29th, and makes the floor tiles rainbow.
2021-05-24 12:32:15 -04:00
tralezab
9904e2a244 Refactors both taming + egg laying + animal colors into components (#58919)
Co-authored-by: Floyd <Floydje123@hotmail.com>
2021-05-22 17:55:25 -07:00
ArcaneMusic
18370285da Mail holidays. (#58728) 2021-05-08 04:29:14 -07:00
tralezab
1928826bc7 Refactors pet bonuses to be an element (#58912) 2021-05-07 15:26:59 -07:00
cacogen
0c5a968a83 Makes holidays span all timezones by default (#58673)
* Adds timezone support for regional holidays

Also adds timezones to Waitangi Day, ANZAC Day, US Independence Day and Bastille Day

* Makes holidays span all timezones by default

Changes April Fools, Halloween and Christmas to be the correct dates instead of a range, using three timezones to cover the correct range instead

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-04-29 15:46:32 -07:00
Winter Flare
b1fc436afc Mexican Food Tab, Food Tagging Tweaks (#58622)
* Tagging Fixes, Food Moves

Fixes Food Tags on a bunch of burritos. (3/4 don't use MEAT. They were tagged with MEAT.)
Fixes Food Tag and renames Egg Wrap (It doesn't use Tortillas. No GRAIN)
Moves Scotch Egg and Egg Wrap to EGG foods.

Makes a Mexican Food Tab, and moves burritos, tacos, and nachos into it.
2021-04-23 16:28:48 -07:00
Kyle Spier-Swenson
0c93ba659f Shorten april fools to 3 days (#58144)
this way it covers all the timezones
2021-04-04 17:00:32 -07:00
ATH1909
f7accbd1ad Bunnies conjured from top hats each start with no eggs remaining instead of ten (#57597)
This PR adds a subtype of rabbits that starts with eggsleft = 0 instead
of eggsleft = 10 to the game, and makes top hats summon them instead of
normal rabbits. Note that these rabbits can still lay loaded eggs if
you feed them carrots (each carrot will give them 1-4 more eggs, which
they will disgorge from themselves with time).

The slowdown values of the Easter Bunny outfit's pieces have been
nerfed to be -0.3 each instead of -1 each, which I believe should make
someone wearing both pieces of the outfit move at the same speed as a
cultist who's wearing berserker robes (which have a slowdown value of
-0.6). Both pieces of the Easter Bunny set now also have the
THICKCLOTHING flag, and the Easter Bunny head now has the SNUG_FIT
flag.

---

https://youtu.be/QZj3h7FODhU

So, #56773 added the ability to pull rabbits from hats using wands. It
was a great PR, but there was one teensy little issue with it- each
rabbit that you pull out of a hat will, over a somewhat long period of
time, lay 10 loaded eggs, which you can use in-hand to receive a
chocolate egg and an Easter-related item.

Most of these items are just action figures, toys, etc., but two of the
items in the pool of prizes are the Easter Bunny head and the Easter
Bunny suit, which are two of the very few pieces of clothing in the
game that have negative slowdown values. Wearing even one of them will
let you zoom across the station at incredible speeds (you can see this
demonstrated in the Youtube video I linked above).

You will still be able to farm for Easter Bunny gear after this PR, but
you'll now have to acquire a consistent source of carrots and feed each
rabbit a carrot whenever you think it's low on remaining egg uses (you
can't stockpile eggsleft charges too far, as carrots won't increase the
eggsleft variable if it's >=8). You'll also still have to actually
collect and open each laid egg and deal with the risk of getting
swarmed by bees. This, I think, is a reasonable enough amount of effort
to acquire post-nerf Easter Bunny gear.

It should also be noted that you'll still be able to farm pet moodlets
and meat slabs from bunnies, which I've decided to leave in because you
can already do a similar thing with the kittens produced by Runtime and
a cat clone from cytology (which will always be male). Also, petting
zoos are fun, and I like the idea of the chef using small, innocent
creatures (and some bees) that have been summoned by stage magic as the
primary source of his food's meat.

The new clothing flags are there because the Easter Bunny set looks
like a mascot costume, which should be resistant to syringe injections
and dislodgements from thrown hats.
2021-03-11 17:00:57 +00:00
cacogen
34bd52c51d Makes spawned hot cross buns edible again (#57179)
Fixes (Not being able to eat hot cross buns due to them not having a reagents list)

You no longer hit yourself in the face with these.

Also does the following:

Formats the taste list properly (so it doesn't taste indescribable)
Fixes grammar in name and desc
Adds BREAKFAST foodtype
Adds pastry taste
Makes it require a bread slice rather than a whole loaf (not economical)
Moves it to the bread category
2021-02-25 23:01:24 -08:00
Ryll Ryll
83ec7a698f Adds pulling rabbits from top-hats (#56773)
This PR makes it so using a wand on a top-hat makes a rabbit appear in
your hand! Fun! There's a 10% chance that instead of a cute bun you get
angry bees though, but a true performer will soldier on anyway. You can
now also scoop up rabbits in your hands, and scooping animals only
requires one free hand to do so instead of all your hands being free.
2021-02-22 10:16:12 +00:00
Mothblocks
0f435d5dff Remove hideous inline tab indentation, and bans it in contributing guidelines (#56912)
Done using this command sed -Ei 's/(\s*\S+)\s*\t+/\1 /g' code/**/*.dm

We have countless examples in the codebase with this style gone wrong, and defines and such being on hideously different levels of indentation. Fixing this to keep the alignment involves tainting the blames of code your PR doesn't need to be touching at all. And ultimately, it's hideous.

There are some files that this sed makes uglier. I can fix these when they are pointed out, but I believe this is ultimately for the greater good of readability. I'm more concerned with if any strings relied on this.

Hi codeowners!

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-14 16:53:29 -08:00
Qustinnus
95731342b9 [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#56309)
This PR adds station traits which are essentially small changes to a normal round that can be used to create small variations in how a round might play out, sometimes there might be only one, very simple trait, but you might have a round where they have a somewhat bigger impact, to make rounds feel slightly more different from each other.

The following traits have been added:
Positive:

    Lucky winner - Free pizza and beer every 6-12 minutes
    Galactic Grant - Larger starting funds for cargo
    Premium internals boxes - emergency box has flare + radio as bonus
    Bountiful bounties - Bounties pay 20% more
    Strong supply lines - Imports 20% cheaper
    Filled maint - More loot in maint
    Fast shuttle - Cargo shuttle is faster
    Free scarves - Free scarfs if a slot is free

Neutral:

    Bananium shipment - Clown starts with 5 sheets of bananium (Neutral because this helps noone but the clown)
    Unnatural atmosphere - Lava planet can get more restricted gasses
    Unique AI - Random lawset at roundstart for AI
    Ian adventure - Ian teleports to a random spot on the station
    Glitched PDAs - PDA's have a different beep
    Announcer intern - Changes the announcement messages to sound like they're from an intern at Centcom

Negative:

    Carp infestation - Carp event is more common and can start earlier
    Weak supply lines - Imports 20% more expensive
    Blackout - Station lights are partially broken around the station
    Empty maint - Less loot in maint
    Overflow bureacracy mistake - Random overflow job (From a vetted list)
    Late Arrivals - Everyone starts in arrivals
    Random spawns - Random spawn location (by drop pod)
    Slow shuttle - Cargo shuttle is slower

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-05 15:49:49 -08:00
Fikou
c4f9a86bdb adds vars for damage done by temp on simplemobs (#56572)
instead of heat and cold damage being handled by unsuitable_atmos_damage, instead its handled by unsuitable_heat_damage and unsuitable_cold_damage
if these vars arent set on the mob, they are set by default to the value of unsuitable_atmos_damage
2021-02-03 00:06:56 -08:00
interestingusernam3
44693b6d8f Removes ambiguity in holiday name. (#56162)
About The Pull Request

"Independence Day" is now "US Independence Day"
Why It's Good For The Game

There are dozens of independence days around the world, the current name is too ambiguous.
Changelog

🆑
tweak: The holiday observed on every 4th of July is now called "US Independence Day" instead of just "Independence Day".
/🆑
2021-01-17 12:06:28 +13:00
Qustinnus
5ef0f4afa2 On monkey day, you can play as a monkey roundstart (#55838) 2020-12-31 13:20:53 -08:00
interestingusernam3
0bc9ddf7ad Replaces US Indigenous People's Day with International Indigenous People's Day (#55458)
Title. This modifies a unit test that tested the holiday I'm removing to test mother's day instead, as International Indigenous People's Day isn't an nth week holiday.
2020-12-29 14:52:57 +13:00
Ghom
cd1d49112c Fixing a very old issue about lizard snouts and hoods, fake mustaches and similars. (#55574)
Fixing a little visual issue with certain hoods, fake mustaches and similars making lizard snouts magically disappear when worn.
2020-12-20 16:28:52 -08:00
Jack LeCroy
23ee09967e Fix Hanukkah (again) and refactor Moth Week and Beer Day (#55532)
* Fix Hanukkah (again) and refactor Moth Week and Beer Day

* Remove unnecessary changes
2020-12-16 17:16:44 -08:00
cacogen
f1aa3c2e9d Adds Waitangi Day and ANZAC Day to holidays.dm (#55519)
* Adds Waitangi Day and ANZAC Day to holidays.dm

* Makes the poppy the default drone hat on ANZAC day

The remembrance poppy is an artificial flower worn to commemorate those who died for their country.
2020-12-15 19:48:43 +13:00
Jack LeCroy
f66b0452a2 Fix nth week holidays (#55364)
fix: Holidays appearing on the nth day of the month like Thanksgiving will work now.
tweak: Columbus day is now called Indigenous Peoples' Day.
2020-12-06 17:29:04 -08:00
Qustinnus
f887155b27 Kills oldfood, Puts newfood on top. (#55160)
Slays the last of old-food, making new-food the new normal.

Co-authored-by: MrMelbert <kmelbert4@gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-12-04 00:11:47 -08:00
TiviPlus
0eaab0bc54 Grep for space indentation (#54850)
#54604 atomizing
Since a lot of the space indents are in lists ill atomize those later
2020-11-30 12:48:40 -05:00
Qustinnus
41157f5d6b Moves grown food to newfood (#55040)
Moves grown food to newfood
Gives trash element support for callbacks for item creation override
2020-11-23 14:00:23 -08:00
Qustinnus
b713fa1bc3 moves misc food to newfood code (#54788)
misc food is now using newfood code
2020-11-18 12:20:47 -08:00
ShizCalev
b720bcd63d adds more cursed animal masks (#53539)
Animal masks refactor
2020-10-15 22:16:00 +02:00
Qustinnus
3068082e35 sodium chloride is now called salt (#54328) 2020-10-12 15:19:09 -03:00
Qustinnus
eca964db35 Ports soup, snacks, icecream, salads and meat to newfood (#54028)
Ports soup, snacks, icecream, salads and meat to newfood
2020-09-29 20:36:27 -07:00
Qustinnus
c6be808bf3 Moves over cakes to newfood and transfers reagents when crafting (#53316) 2020-09-07 15:04:14 -03:00
TiviPlus
ca366c3ea1 Bools and returns super-pr (#53221)
Replaces like 70-80% of 0 and such, as a side effect cleaned up a bunch of returns
Edit: Most left out ones are in mecha which should be done in mecha refactor already
Oh my look how clean it is

Co-authored-by: TiviPlus <TiviPlus>
Co-authored-by: Couls <coul422@gmail.com>
2020-08-28 14:26:37 -07:00
Qustinnus
87c4df3880 Food refactor part 1: Bread destruction and processable element (#53047) 2020-08-20 21:07:05 -03:00
uomo
358e549229 Petting more animals now causes floating hearts and a moodlet, borgs can now pet animals. (#52594)
* Petting.

* Oops.

* Update code/modules/mob/living/simple_animal/friendly/penguin.dm

Co-authored-by: Fikou <piotrbryla@onet.pl>

* Working on underlying redo.

* More.

* Fixing to work with new emote system.

* Move proc and defines to living instead of mob.

* ...Moves it to simple_animal instead.

* Revert cat crate fix (other PR handling), fixes emote thing.

* Appveyor did not care for that.

* Comment typo.

* Very descriptive var name.

* Borgs can now commit pet.

* sweeps up missing manual_emotes, adds a hop to link for ghosts, and moves the name preface to ghost only

* More descriptive vars and proc name.

* Better descriptive vars.

* Making the borg code slightly nicer.

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-08-07 20:46:49 -04:00
AnturK
e5cf3c05b8 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 05:13:36 -03:00
skoglol
ecae391aa8 Fixes moth week dates (#52353)
* Fixes moth week dates

* Fixes week number function

* first day of month proc, fixes moth week properly
2020-07-20 16:35:13 -03:00
Jack Edge
b13da57769 🎁 Fix holiday loot being ultra rare
Since maintenance loot was put in the wide categories of trash, common,
uncommon and oddities, the Easter and Christmas maintenance loot was
made incredibly rare.

This commit increases the chances to around 25% of all maintenance loot
to be a special holiday item, rather than the tiny oddity level chance
before.
2020-06-24 12:14:54 +01:00
nemvar
b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
nemvar
6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
Couls
3bc4f93eb1 fixes the islamic calendar and adds more prefixes (#50695)
About The Pull Request

it is no longer the start and end of Ramadan at the same time
Why It's Good For The Game

fixies
Changelog

cl
add: more islamic prefixes
fix: end of ramadan now follows the islamic calendar
/cl
2020-04-28 11:15:27 +12:00
Jack LeCroy
2860850635 Add foreign calendar datum
Converted Hebrew calendar to a child of this datum
Foreign calendar is an easy way to support other
calendar systems for the purpose of holidays.
Added Islamic calendar and fixed Ramadan to
be more accurate than it currently is.
2020-04-20 18:22:38 -04:00
oranges
5f9037cd1a Further ToS cleanup (#50518) 2020-04-18 10:29:26 +12:00
spookydonut
8dbf1cf4ec Changes to comply with GitHub TOS
Further changes to comply with the ToS

More ToS cleanup

Bye bye George Melons

Better to be safe than sorry
2020-04-14 21:24:50 +00:00
Fikou
facef200d4 last commit probably 2020-02-25 01:48:34 +01:00