Commit Graph

14220 Commits

Author SHA1 Message Date
SkyratBot
95750dcec0 [MIRROR] Auxiliary Base construction fixes (#3546)
* Auxiliary Base construction fixes (#56969)

* Base construction fixes

* Auxiliary Base construction fixes

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-02-20 23:11:16 +00:00
SkyratBot
29b95d17ff [MIRROR] Fixes chemscan runtiming on mindless (#3543)
* Fixes chemscan runtiming on mindless (#57046)

* Fixes chemscan runtiming on mindless

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2021-02-20 23:11:11 +00:00
OrionTheFox
fa73f9cdab Adds Loincloths (#3499)
* Add Loincloths

Adds leather and cloth loincloths, craftable with their namesake materials; also adds a sensor variant in the Autodrobe and Loadout.

* what the fuck

oh no its broken

* feck

changes defines to be correct, fixes female sprites borking, lets you fix your wedgie, and adds cloth crafting. basically fixes everything.
2021-02-20 22:00:19 +00:00
SkyratBot
8fa9c25d27 [MIRROR] added a new admeme weapon: foam finger that shoots missiles as requested by boris (now in arcades!) (#3538)
* Add a new admin weapon: foam finger that shoots missiles (#57013)

An admin only rocket firing foam finger has been added. There is also
a toy version available from arcades that is just a giant foam finger.

* added a new admeme weapon: foam finger that shoots missiles as requested by boris (now in arcades!)

Co-authored-by: c420-o <76887567+c420-o@users.noreply.github.com>
2021-02-20 16:10:33 +00:00
SkyratBot
653233597f [MIRROR] Fixes restraint alerts doing nothing when clicked. (#3534)
* Fixes restraint alerts doing nothing when clicked. (#57034)

* Fixes restraint alerts doing nothing when clicked.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-02-20 16:09:04 +00:00
SkyratBot
eb765f958a [MIRROR] Crafting menu tells you which colour of crayon is needed (#3519)
* Crafting menu tells you which colour of crayon is needed (#56950)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Crafting menu tells you which colour of crayon is needed

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-19 23:15:11 +00:00
SkyratBot
8cb1c0040b [MIRROR] Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics. (#3512)
* Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics. (#56871)

Since reactions now require a bit more involvement from chemists, ghetto chemistry is a bit harder. This seeks to help some of those problems by providing new tools for those without a chem heater/reaction chamber.

Also some of these might be useful for chemists in the lab too!

Here's what you can make:
image
the burners are similar to candles - except they burn their internal reagents. The temperature they heat by is dependant on the flame, fuel and oil burn for a lower amount, ethanol for a higher amount and plasma for the highest amount. They can be put on tables and bonked with beakers for a quick way to heat them (similar to lighters). You'll need to light them with a match or lighter too, though, and can be put out by use in hand.

The thermometer looks like this and gives you temperature readings!
thermom

The pH booklets are the same as before - but you can now craft them by making universal indicator. These are the best way for a ghetto chemist to check their pH, and multiple sheets should be used over a reaction.

The improvised chem heater looks like this, and is a reconfigured space heater, it requires more materials and tools lending itself to a static drug den, but has the best method of adjusting temperature and fighting against exo/endo thermic reactions:
Improv_heater

Finally, the cooling spray lets chemists do the oposite of a lighter on their beaker - cooling the reagents within. In addition, fire extinquishers perform the same function.

In addition ice and universal indicator have been added as reactions.

Co-authored-by: Rohesie <rohesie@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics.

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-02-19 19:14:58 +00:00
SkyratBot
4c0077d6ab [MIRROR] Fixes Cigarettes being lit in no-oxygen environments (#3507)
* Fixes Cigarettes being lit in no-oxygen environments (#56911)

This closes #26487 (Issue about cigs working fine in non-oxygenated enviroments) which has been a known bug for years. Everyone knows how EXTREMELY CRITICAL cigarettes are to game balance. Plasmamen being able to smoke in a room with no oxygen? Spessmen smoking in the hard vacuum of space? What is this madness?!?

I must put an end to these OP tactics.

My changes make it so that if a cigarette has either one mole of oxygen in the current atmosphere or is injected with oxygen reagents, then it can be smoked.

I've also made it so "Space" cigarettes can be smoked in space by changing the default starting reagents to include oxygen. The description was also updated to hint that they can be smoked anywhere.

Also I added a has_gas proc to gasmixtures. I have seen a few places in the code where this can be used and once this gets merged, I will be doing a refactor to clean some code involving it. (bonfires, plasmamen code, etc.)

(Note from lemon, if you use this in the supermatter I will eat you)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>

* Fixes Cigarettes being lit in no-oxygen environments

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
2021-02-19 17:03:09 +00:00
SkyratBot
d0dc199815 [MIRROR] /mob/living/proc/Life(delta_time) (#3509)
* /mob/living/proc/Life(delta_time)

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:55:52 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
accafd8deb [MIRROR] Cleans up living duffel bag code to meet guidelines (#3501)
* Cleans up living duffel bag code to meet guidelines (#57014)

* Cleans up living duffel bag code to meet guidelines

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-19 13:08:50 +00:00
YakumoChen
85d72458a1 Fixes radio jammer special_desc (#3502)
* mystify radio jammer

* Update emags.dm

* Update emags.dm

* Update toolbox.dm

* syndie duffels

* Update emags.dm

* fixes radio jammer
2021-02-19 13:08:30 +00:00
SkyratBot
d757510356 [MIRROR] Fixes reflection of hitscan beams against tiles (#3493)
* Fixes reflection of hitscan beams against tiles (#56881)

Co-authored-by: Ranged <nickvanderkroon@ gmail.com>

* Fixes reflection of hitscan beams against tiles

Co-authored-by: NotRanged <rangedvdk@gmail.com>
Co-authored-by: Ranged <nickvanderkroon@ gmail.com>
2021-02-18 21:04:19 +00:00
SkyratBot
d2c0090c83 [MIRROR] replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time (#3478)
* replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time

* a

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-18 21:00:40 +00:00
Swiftfeather
5e216e3110 deathsquads aren't real. (#3473) 2021-02-18 20:00:45 +00:00
SkyratBot
f9d9915277 [MIRROR] Adds a plushie sprite for suit storage (#3482)
* Adds a plushie sprite for suit storage (#56919)

fix: Adds a sprite for plushies in suit storage slots.

* Adds a plushie sprite for suit storage

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-18 19:21:57 +00:00
SkyratBot
89f140c760 [MIRROR] stops people using message all when their pda doesn't allow it (#3489)
* stop people using message all when their pda doesn't allow it (#57005)

Fixes not checking for Send All permissions in Topic.

* stops people using message all when their pda doesn't allow it

Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
2021-02-18 19:20:12 +00:00
SkyratBot
d2dc788dc0 [MIRROR] fixes being unable to attach training toolboxes to training units (#3479)
* fixes being unable to attach training toolboxes to training units (#56990)

* fixes being unable to attach training toolboxes to training units

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-02-18 13:03:59 +00:00
Gandalf2k15
3461432334 a 2021-02-17 15:03:32 +00:00
SkyratBot
3b85cf1430 [MIRROR] Addiction rework (#3445)
* Addiction rework

* a

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:26:44 +00:00
SkyratBot
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
SkyratBot
b8be84f61e [MIRROR] Hovering your mouse over things now shows their name on the top of the screen (#3446)
* Hovering your mouse over things now shows their name on the top of the screen (#56729)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Hovering your mouse over things now shows their name on the top of the screen

* a

* Update preferences_savefile.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:16:29 +00:00
SkyratBot
c7ee4d2b13 [MIRROR] Plumbing IV drip (#3453)
* Plumbing IV drip (#56920)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Plumbing IV drip

Co-authored-by: Time-Green <timkoster1@hotmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-17 13:43:42 +00:00
YakumoChen
8d20e999ee Yet more special description contraband (#3428)
* mystify radio jammer

* Update emags.dm

* Update emags.dm

* Update toolbox.dm

* syndie duffels

* Update emags.dm
2021-02-17 01:19:51 +00:00
SkyratBot
4b385c1372 [MIRROR] Can no longer immediately return a wayfinding pinpointer for a costume (#3441)
* Can no longer immediately return a wayfinding pinpointer for a costume (#56916)

* Can no longer immediately return a wayfinding pinpointer for a costume

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-17 01:16:25 +00:00
SkyratBot
18f7ed58eb [MIRROR] Removes older ID consoles from the code, and circuitboards (#3284)
* Removes older ID consoles from the code, and circuitboards

* Merge branch 'master' into upstream-merge-56792

* a

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-16 12:44:12 +00:00
SkyratBot
923112633e [MIRROR] Gets Rid of Both Sleeps In Transit Tubes, Replaces Them With Timers (#3412)
* Gets Rid of Both Sleeps In Transit Tubes, Replaces Them With Timers (#56913)

* Gets Rid of Both Sleeps In Transit Tubes, Replaces Them With Timers

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-02-16 00:47:39 +00:00
SkyratBot
6f31c971d9 [MIRROR] Glowcap spread endurance loss is 10 times bigger (#3414)
* Glowcap spread endurance loss is 10 times bigger (#56885)

Co-authored-by: MLGTASTICa <ak9bc01d@ yahoo.com>

* Glowcap spread endurance loss is 10 times bigger

Co-authored-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>
Co-authored-by: MLGTASTICa <ak9bc01d@ yahoo.com>
2021-02-16 00:45:57 +00:00
SkyratBot
63de7b4b0d [MIRROR] Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#3415)
* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#55551)

Converts the effects of the nightmares light eater into a component and a couple elements
Adds some flavor text to the light eater
Makes the effects of the nightmare's light eater dispel if the armblade is destroyed
Probably a net increase in code quality
More flavortext
The nightmare's light eater effect can be dispelled if you are willing to sacrifice the armblade

* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-02-16 00:45:39 +00:00
Gandalf
c0b99ccfef Coronal Mass Ejection Event (#3280)
* a

* Update cme.dm

* Update _cme_defines.dm

* Update cme.dm

* Update cme.dm

* Update cme.dm

* a

* Update cme.dm

* a

* random!

* TEMP DEBUG STATS, UNDO ONCE READY TO MERGE!

* a

* Update cme.dm

* better sfx

* Update cme.dm

* Update cme.dm

* Update cme.dm

* Neutralize!

* Update cme.dm

* Update cme.dm

* a

* Update cme.dm

* Update cme.dm

* Update cme.dm

* CME changes

* Update anomaly_neutralizer.dm

* aa

* Update cme.dm

* a

* Update admin_verbs.dm

* Fix gamma loop

* Update cme.dm

* Update set_security_level.dm

* Update code/controllers/subsystem/events.dm
2021-02-15 20:18:57 +00:00
Elli-Skala
888e223d69 makes bone spears have reach of two (#3383)
* Update spear.dm

* Update spear.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-15 19:51:50 +00:00
SkyratBot
0cf8d6a649 [MIRROR] Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#3403)
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754)

* Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.

* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols

* Update maint_loot_common.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 17:48:59 +00:00
SkyratBot
ef6df1167f [MIRROR] Portable chem mixer: Integration of fermichem and minor updates to usability (#3402)
* Portable chem mixer: Integration of fermichem and minor updates to usability (#56894)

- The portable chem mixer now displays pH-values
- It can now dispense 1u of reagents, so buffer solutions can be added carefully
- It can now be loaded with bottles, plastic bottles and condiment bottles (all bottle types that the chem masters/chemistry can make). Beakers also still work of course.
- CTRL+click opens and closes it to switch between filling mode (inventory in which you place beakers and bottles) and dispensing mode (UI in which you dispense to a container)
- When worn on the belt and in filling mode, a left click opens its inventory. No more dragging or alt-clicking needed to open it. (alt-clicking to swap beakers in dispense mode still works, just like the normal dispensers)
- The UI has been resized to, in its default state, make it easier to visually skim through the chemicals in the list

* Portable chem mixer: Integration of fermichem and minor updates to usability

Co-authored-by: LordVollkorn <66637090+LordVollkorn@users.noreply.github.com>
2021-02-15 15:33:48 +00:00
SkyratBot
e8d2b34964 [MIRROR] Add back hearts for valentines, but in a sane manner (#3401)
* Add back hearts for valentines, but in a sane manner (#56900)

Adds back hearts removed by #56897, but in a way that doesn't completely murder timers.

Also made the code a bit better.

Here you can see it on my hideous date.

https://user-images.githubusercontent.com/35135081/107848333-6ec06280-6da7-11eb-91b6-1382380eb3b4.mp4

* Add back hearts for valentines, but in a sane manner

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-02-15 15:33:30 +00:00
SkyratBot
b119c054d9 [MIRROR] Add gas giant controversy posters (#3399)
* Add gas giant controversy posters (#56830)

* Add official There Is No Gas Giant poster

🆑 ArcaneMusic, coiax
add: Nanotrasen reminds its crew members that the station has never
orbited a Gas Giant, and is engaging in a media campaign to remind
employees of this fact.
/🆑

There is a half remembered fact that Space Station 13 orbits a gas
giant, allegedly due to some entry on a wiki someplace.

Given the vigorous discussion on this subject, it seems appropriate that
this confusion is forever immortalised in poster form.

With thanks to @ ArcaneMusic for doing the sprite.

* gas truths

Co-authored-by: tralezab <spamqetuo2@ gmail.com>

* Add gas giant controversy posters

Co-authored-by: coiax <yellowbounder@gmail.com>
Co-authored-by: tralezab <spamqetuo2@ gmail.com>
2021-02-15 15:32:46 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
a765e5b0db [MIRROR] Pirates are split into three different ghastly crews! (#3395)
* Pirates are split into three different ghastly crews! (#56264)

Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Pirates are split into three different ghastly crews!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-15 13:32:35 +00:00
Tom
14e7d9a446 fixes clothes (#3390) 2021-02-14 20:14:19 +00:00
SkyratBot
c5779d4c16 [MIRROR] lowers the size of torches, and lets them be made with leafy mushrooms (#3379)
* lowers the size of torches, and lets them be made with leafy mushrooms  (#56877)

* lowers the size of torches, and lets them be made with leafy mushrooms

Co-authored-by: Elli-Skala <69182855+Elli-Skala@users.noreply.github.com>
2021-02-14 10:23:25 +00:00
SkyratBot
1ceb3c3143 [MIRROR] RCDs now use right click to deconstruct (#3377)
* RCDs now use right click to deconstruct (#56864)

RCDs use right click to deconstruct, everything else is functionally the same. The RCD defines also aren't bitflags anymore, they didn't seem to have any reason to be in the first place.

* RCDs now use right click to deconstruct

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
2021-02-14 10:23:03 +00:00
SkyratBot
35416cafb3 [MIRROR] Makes the spy bug pocket protector a suit accessory (#3376)
* Makes the spy bug pocket protector a suit accessory (#56883)

* Makes the spy bug pocket protector a suit accessory

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-14 10:13:09 +00:00
Tom
5a5f217bad [SEMI-MODULAR] Resprites and new clothing for Captain, HoS, and Detective (#3363)
* adds fits

* det clothes, update descriptions

* adds hos parade jacket
2021-02-13 23:30:56 +00:00
SkyratBot
be1e6ae01d [MIRROR] Gives wizard constructs a purple theme. Minor construct fixes. (#3361)
* Gives wizard constructs a purple theme. Minor construct fixes.  (#56758)

* Gives wizard constructs a purple theme. Minor construct fixes.

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
2021-02-13 23:21:05 +00:00
SkyratBot
495b35a679 [MIRROR] Converts all uses of modifiers to lazy access to avoid memes in future (#3331)
* Converts all uses of modifiers to lazy access to avoid memes in future

* Update work_tools.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-13 11:06:39 +00:00
SkyratBot
a51f056319 [MIRROR] Moves the plant analyzer chem mode to right click + lets you read out a tray's chemical contents (#3347)
* Moves the plant analyzer chem mode to right click + lets you read out a tray's chemical contents

* Update growninedible.dm

* Update grown.dm

* Create grown.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-13 11:03:46 +00:00
SkyratBot
c21ac8c176 [MIRROR] Fixes bullying socially anxious dead people by blowing kisses at their corpse (#3346)
* Fixes bullying socially anxious dead people by blowing kisses at their corpse (#56732)

At the end of #56698 I added interactions for people with the social anxiety quirk so they sometimes get flustered when hit by a kiss, but I realized precisely 0.2 seconds too late that I didn't actually check if they were alive or conscious before doing so.

This PR fixes this so those reactions will only happen if they're conscious or in soft crit. I also changed the description of the kiss of death lipstick, cause I forgot to put one

* Fixes bullying socially anxious dead people by blowing kisses at their corpse

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-13 10:13:58 +00:00
SkyratBot
c430e11d0b [MIRROR] Fixes tags on ordered pizza (#3344)
* Fixes tags on ordered pizza (#56369)

Box tags

    Fixes bug where box tags weren't updating correctly on creation
    Adds box tag flavours for the pizzas without them (i.e. Donk Pocket -> Bangin' Donk, Dank -> Fresh Herb, Sassysage -> Sausage Lovers, Arnold -> 9mm Pepperoni)

Randomised pizza crates

    Pizza crates can now come with any five pizzas, weighted by disruptiveness
    Small chance of getting one pizza bomb in a pizza crate (either armed or not) per shift

Armed pizza bomb

    Adds an armed variant of the bomb pizza box, which has the boxtag "Meat Explosion", contains a meat pizza and explodes 5 seconds after opening
    Makes the pizza party spawner use the armed bomb pizza box, instead of giving whoever a free syndicate pizza bomb they probably aren't allowed to use anyway

Secure kitchen crate

    Adds the secure kitchen crate from my previous PR
    Adds a secure pizza crate variant to KiloStation's cargo warehouse where the freezer crate was, which contains the pizza party and is locked with kitchen access

Ghost examines

    Adds ghost examine messages for pizza boxes with bombs or the nanomachine pizza in them

* Fixes tags on ordered pizza

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-13 10:13:43 +00:00
KathrinBailey
1c17fb7dfb Prison Wars Episode 6: Return of the Genpop (#3322)
* Adjusts miner and prisoner slots

* Update landmarks.dm

* Oh yeah, borg slots.

* Merge branch 'master' into Shafts-uwu

* Genpop

* IDs say hi once sentence is up

* azzu wazzu helps linters

* wazzu

azzu!

* Update turnstile.dm

* Update turnstile.dm

* Update turnstile.dm

* the dme!

* Stops you shooting through turnstiles

You can still cross into them though. You just can't yeet stuff through them.
2021-02-13 02:34:13 +01:00
SkyratBot
3ca963e390 [MIRROR] Winter coats (#3327)
* Winter coats (#56854)

add: Thirteen more winter coats covering all departments and most jobs.

* Winter coats

Co-authored-by: Tom <tomforde4@gmail.com>
2021-02-12 14:45:48 +01:00
SkyratBot
bff6b2e317 [MIRROR] Makes n2o nontoxic, for reasons (#3321)
* Makes n2o nontoxic, for reasons (#56839)

Counter to the original intent of the change seen here #50126, n2o will currently deal damage when used with both internal tanks and floods, as the threshold picked for it was about 0.15 moles at room temperature. Even outside this oversight, the original goal can't easily be achieved. Because breathing works off partial pressures, anything you can do with an anesthetic can you can do with an n2o flood.

Therefore I don't think it's behavior worth keeping, as even as a way to disincentivize non-antag n2o floods it would do little.

* Makes n2o nontoxic, for reasons

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-12 12:52:34 +00:00