Commit Graph

12351 Commits

Author SHA1 Message Date
Akrilla 1fe0d9a697 Spray cans can't be set to extremely dark colours (#46213)
* no dark

* lighter

* limit only affects objs

* fix
2019-09-03 01:34:40 -04:00
Akrilla 197fd1056c Removes crayon eating colour change (#46210)
* better colours, no eating

* renamed

* powder

* missed renames
2019-09-03 00:30:04 -04: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
skoglol 86839addb9 Pulling lockers now slow you down. (#46216)
Pulling lockers now slow you down.
2019-09-02 18:32:54 -07:00
bgobandit c606522bec Non-tagger graffiti counts as bad art (and other art adjustments.) (#46248)
About The Pull Request

    Non-taggers' graffiti counts as bad art. Taggers' graffiti counts as good art, not great art.
    Makes the art defines global defines and removes some magic numbers.
    Re-orders the switch statement for art to go ascending instead of descending, because otherwise if something is at BAD_ART it will register as good instead, if it's at GOOD_ART it will register as great, etc., which defeats the purpose of having defines.

Why It's Good For The Game

The tagger component: Because there isn't really much bad art in the game ,and graffiti is as obvious a candidate as any, and gives the janitor an actual excuse to remove it besides being a dick. If you don't want the potential for a bad moodlet, don't examine the art. You have to go out of your way to do so anyway.

Very slightly nerfing tagger graffiti: Because "what a thought-provoking piece of art" is kind of much for graffiti.

The other component: Because there's no point in having defines if people are just going to put magic numbers everywhere anyway. (I left the impressiveness numbers for statues, etc. alone, because those can take damage, dropping their quality. But if something can't take damage, just use the define.)
Changelog

cl
tweak: Graffiti by a non-tagger counts as bad art.
/cl
2019-09-02 09:17:41 +12:00
Fikou 4dd56ee757 Makes the windup toolbox more similar to His Grace (#46243)
* rumble bumble

* oopsie woopsie!!
2019-09-01 16:16:07 +02:00
Bobbahbrown cc32c7fee1 fixes all the bugs you probably didnt know about (#46264)
About The Pull Request

As mentioned in codebus with the recent patch for circuits being able to produce any item (see BeeStation/BeeStation-Hornet#345), people often make a mistake in attempting to check if a collection does not contain an element. The proper execution of such a check, following the attempted formatting, would be...

!(x in y)

But instead we have lots of

!x in y

In other words, 1 or 0 in collection y, not good!
Why It's Good For The Game

Fixes a lot of bugs that likely nobody has ever noticed, probably introduces features that were intended but incorrectly coded. I have attempted to summarize what are probably the effects of this change below. I've moved interesting fixes to the top of this list.

    Dynamic mode ruleset should no longer ignore player preferences when selecting antagonist candidates.
    Pet carriers should now properly cancel callbacks for a mob escaping the carrier if they are no longer an occupant of it.
    Eightballs should now prevent ghosts from voting on answers that are not expected by the eightball.
    Modifying variables in view variables should now prevent you from adding a non-existent variable to a datum.
    The Herald's Beacon should no longer attempt to remove a non-existent voter from its list of users who need to vote. (Likely prevents a runtime)

Changelog

cl bobbahbrown
fix: Dynamic mode ruleset will now respect your player preferences when selecting antag candidates
code: Fixed 9 instances of incorrect not-in-list expressions.
/cl
2019-09-01 19:55:59 +12:00
Rob Bailey 2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
nemvar 052fa4edb2 Adds a new mutation: Antiglow (#45990) 2019-08-29 16:14:26 -07:00
skoglol 31d8e31727 Incinerator and toxins burn chamber monitoring, some mapping fixes. (#46081)
* pre tgui dimensions

* Added extra dropper, air mix consoles.

* forgot some stuff

* Some more mapping stuff, cleanup.

* readds albums
2019-08-29 16:09:52 -07:00
bgobandit 8fb17108fa You can no longer give the AI laws containing IC filtered words. (#46072)
* You can no longer give the AI laws containing IC filtered words. Adds a proc to accomplish this.

* turns proc into a define, adds it to hacked module because I forgot
2019-08-29 15:58:20 -04:00
nemvar 1c01c44465 Fixes tray runtime (#46189) 2019-08-29 10:25:26 +02:00
Fikou 3479a1839c Touches everything i left out in #46060 + some smol cult changes (#46109)
* chap helmet updat

* russian buff

* various cult robe things

* a

* oh there was booboos in the file i was working in haha

* wtf i hate cock cult now

* oh i did it the wrong way
2019-08-27 19:14:48 -04:00
Akrilla bcb753740c Stun baton knockdown and combat chem tweaks (#46065)
* baton and chems

* trait

* typo and stunpod
2019-08-27 17:29:36 -04:00
penterwast 4dd1e53aa0 Purifying a soulstone removes blood cult status from its shades (#46133)
* Purify removes blood cult status

* Remove cult from new captured shades
2019-08-27 13:16:18 -04:00
kingofkosmos df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
bgobandit ab4abf318f Ports new animated medical scanner sprites from Polaris. (#45994)
Ports new medical scanner sprites from Polaris (PolarisSS13/Polaris#6357) that animate when they scan. They have more tiers of scanner than we do, so I specifically ported Basic for regular and Improved for advanced:

polaris scanners

The traitor scanner doesn't have an animation currently, but it does have the same subtle visual difference (all red pixels up top instead of red-yellow-green) as our old sprite.
Why It's Good For The Game

Because I like these sprites.
Changelog

cl bandit
imageadd: Medical scanners now have animated sprites. Thanks Michiyamenotehifunana of Polaris.
/cl
2019-08-26 20:43:41 +12:00
Rob Bailey 26b04ede42 Obliterates item_color: new washing machine functionality edition (#45961)
About The Pull Request

Completely removes item_color and the clusterfuck of bad programming it caused.

In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed

In places where item_color was used as a dye color, it was converted to the new dye_color var

In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay.

A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items.

Moved some mob overlay files relating to clothing to their own directory as well for organization purposes.

Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results.

Some bonus functionality to come out of this:
the washing machine now supports arbitrary dye colors.
Why It's Good For The Game

It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it.
Changelog

cl
add: Washing machines now support arbitrary dye color
add: Washing machines now dye nearly every item.
refactor: lots of backend changes to clothing overlays, report any issues
/cl
2019-08-26 20:38:11 +12:00
oranges 40c2b7e103 Merge pull request #45976 from cacogen/plantbagcanholdplantgenedisks
Plant bags can now hold plant gene disks
2019-08-26 20:35:55 +12:00
nicbn 1e94f8478e Adds open and close sounds for crates and closets (#46009)
* Adds open and close sounds for crates and closets

* Makes the sounds audible

* Sound normalization

* oops
2019-08-26 00:13:00 -07:00
carlarctg b609fb60af Fix powersink message formatting (#46116)
Fixes a typo in syndicatebeacon.dm and makes src consistent.
2019-08-25 13:49:24 -07: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
Akrilla 1879a1c0b3 Money bag deposits straight into ID (#46003)
* cashmoney

* delete money :)

* actually do it
2019-08-24 20:33:43 +02:00
tralezab aaca9360b8 [READY] LIZARD WINGS for the flight potion, flight potion no longer makes you new species (#46037)
* HEY RACISM GOT A SPRITE ACCESSORY FOR YA

* angel + dragonborn > givespeciesflight

* more review stuff

* last of the review stuff

* compile

* readds my fix

* Boolean numero uno

* Boolean numero dos
2019-08-24 00:11:25 -07:00
nemvar 6d7bccfca4 Jackhammer nerfs. This thing no longer destroys wall instantly. (#46019) 2019-08-23 16:45:31 -07:00
Fikou d02fd12629 adds the ancient spear as a null rod option (#46048)
* adds the ancient spear

* clocked

* switcheroo
2019-08-23 16:38:21 -07:00
carlarctg bda590ec9f improvements! (#46075) 2019-08-23 16:34:41 -07:00
ATH1909 5afc95aa62 How can you kill a god? (now separate from my alkali explosion PR) (#46062)
About The Pull Request

This PR adds a Morrowind reference to "divine" plushies (the Nar-Sie and Ratvar plushies).
Why It's Good For The Game

It's a funny (I hope) joke.
Changelog

cl ATHATH
add: Adds a Morrowind reference that occurs if you try to kill a divine plushie.
/cl
2019-08-24 10:54:41 +12:00
moo 7437be0a9a Cobbduceus Part 2/X: Medibot-chan Tends Your Wounds (#45953)
* meow

* fix var

* cursed

* Revert "cursed"

This reverts commit 249491cfc1c05e21f9650a2d8c109c13741067f5.

* simple anti-multibot
2019-08-23 04:16:34 -07:00
cacogen 99f88c9d32 Canned foods behave more like canned drinks and less like fruit (#46013)
* Canned foods behave more like canned drinks

Have to be opened first, leave an empty can when finished. Don't say they've been bitten when examined.

* Fixes broken paths in maps

* Implements tralezab's feedback

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

* Adds Kryson's unused can state sprites
2019-08-23 01:40:47 -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
carlarctg 189964ef26 Powersink now wrenchs into the grid instead of being screwdrivered into it. (#46038)
* wrench

* PR creep
2019-08-22 17:27:11 -07:00
skoglol 8e6276d450 Adds UI dimension vars to machinery (#45959)
* Adds dimension var to machinery.

* cleaner

* newlines

* Cleanup
2019-08-22 00:33:10 -07:00
Iain Price a86c9e976f Fix placement issue with APC frames (#46023)
Placing an APC on a wall currently evaluates the area that the wall is in ; as walls often border two areas this may not be the area the user expects.  Instead if we evaluate the area of the user we'll be "inside" the target area.

Fixes surpious and inexplicable "This area already has an APC!" errors.

The fact that diagonal placement of frames is prohibited is assumed in this fix.
2019-08-21 23:58:36 -07:00
PKPenguin321 898f544414 [Ready] Adds a Shrink Ray (#45387)
About The Pull Request

    It adds a shrink ray that has 5 shots, can be recharged, has unique (coder)sprites, and has a cool sound
    Shoot a thing with the shrink ray to make it small. Anything can be shrunk except floors
    Shrunken things grow back after a couple seconds, might adjust this
    Small things will not block vision and can be walked over (this includes walls)
    Small people won't fit into their clothes and will drop all their stuff (or rather, their stuff will drop off of them). They also can't move very fast, and take 2x damage while shrunk.
    Preview video here

Why It's Good For The Game

It's really goddamn cool
Changelog

cl PKPenguin321, Fury McFlurry
add: A shrink ray for abductors that they can buy at their console for 2 experiment points. Anything can be shrunken, and shrunken things can be walked over/seen past (for example, you can shrink a wall and then walk around it). If a human is shrunk, they will drop all of their belongings, move slower, and take 2x damage.
imageadd: Shrink ray sprites by Fury McFlurry. Thank you!
/cl

I intend to add it as a thing abductors can purchase but am putting it up now for code review and if anybody has any other ideas on good thematically fitting places to put it.
2019-08-21 11:50:38 +12:00
kevinz000 dcf1b572cf Adds support for admin-bused pneumatic cannons that fire non /items again (#45957)
About The Pull Request

Adds an isitem check so load_item doesn't runtime when it adds a non /item into the cannon which admins can trigger using fill_with_type
Why It's Good For The Game

It probably isn't but let's pretend it lets us do something fun other than making a singularity cannon.
Changelog

cl
tweak: Pneumatic cannons can be used with non /items again.
/cl
2019-08-21 11:39:34 +12:00
Akrilla c5b11dc283 Adds cancel buttons to inputs (#45825)
About The Pull Request

Adds cancel buttons to input boxes that didn't have them before.
Why It's Good For The Game

Good UX.
Changelog

cl
add: More cancel buttons.
/cl
2019-08-21 11:25:41 +12:00
Akrilla ab4011146f Leaving agent card forge name blank randomizes it (#45805)
About The Pull Request

Leaving the forge name text field blank, or it being invalid for another reason, will randomize it.
Why It's Good For The Game

Leave blank to stop the 30 second thinking about what realistic name to give yourself. QoL change.
Changelog

cl
add: Agents cards randomly assign you a name if you leave the name field blank.
/cl
2019-08-21 11:25:20 +12:00
ShizCalev c2200cd1da Cleans up card generation a little (#45784)
Just condensing some code down, nothing really to note.
2019-08-21 11:24:46 +12:00
oranges 57266c7d35 Merge pull request #45701 from Dennok/ChangeTurf-calls-add-keep-air
Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls.
2019-08-21 11:23:11 +12:00
nemvar d93f31f388 Removes airlock charges. (#45989)
* Removes airlock charges.

* stuff for the bundle

* formatting fix.

* Adds the sabotage bag
2019-08-20 09:47:06 -04:00
MMMiracles 5bf2bafdd8 Adds Capitalism Firing Pins (#45893)
* adds capitalism firing pin for late-stage capitalism

* purchase prompt so you can't bankrupt the captain with a rigged gun

* prompt spam check, cargo crates for pins, extra warning message for accepting payment but not having enough to pay out

* test stuff please ignore

* pay-per-shot system, alert instead of input, minor cleanup

* fuck off clown

* range check to prevent long-range purchasing
2019-08-19 22:56:06 -07:00
itsadavid 3c3361d59e tweaks armor values on crab-17 (#45798)
* tweaks integrity and armor values on crab-17

* feedback
2019-08-19 20:15:33 -04:00
carlarctg 15717dda7a Gives borg tools unused sprites (#45939)
* where's the get good button

>adds some borgtools
>fills empty tool pixels with 254 transparency pixels

* tool stuff

* fixes icon

* repoked

* cobbdescus part 123/X: cobbtool cobbmove cobbreview
2019-08-17 23:48:26 -07:00
tralezab 8b190dbc27 fixes golems not getting antag and other things when switching shells (#45941)
fixes golems not getting antag and other things when switching shells
2019-08-17 23:41:33 -07:00
nemvar a40ee7d303 Changes hulk code. (#45866) 2019-08-17 00:55:27 -07:00
Rob Bailey 419bffc8b8 Merge pull request #45937 from tralezab/patch-63
adds a headgear check to crayons
2019-08-17 00:36:51 -07:00
cacogen c4eed865c7 Plant bags can now hold plant gene disks
Useful for quickly loading the disk compartmentaliser with disks.
2019-08-17 12:21:33 +12:00
tralezab 4fa0d761a8 song for this fix: Enigma - Modern Crusaders (#45936) 2019-08-16 21:12:21 +02:00
nemvar 8918a88612 Makes organ decay a lot nicer. (#45845)
* Gets rid of double processing memes.

* fixes the organ box thing

* Makes everything just a tad more performant

* even more performant

* Gets rid of the double processing on SSobj for body eggs

* forgot the brackets

* Also removes double processing memes from the shadowling armblade

* Removes the istype check for MMIs.
2019-08-15 21:52:07 -07:00