Commit Graph
55238 Commits
Author SHA1 Message Date
TomandGitHub acdb02a242 bulkee (#3768) 2021-03-03 05:20:46 +00:00
SwiftfeatherandGitHub 245c32dadd EYYY vape works now (#3790) 2021-03-03 05:20:05 +00:00
7340f8c3db [SEMI-MODULAR] [READY] Space Hotel Rework (#3409)
* a

* :hhh:

* reworks hotel

* iron repath eee

* modularize

* arcade

* cables

* fills unused areas

* does this fix it 🤔

* pipe

* plants and office touchup

* bruh

* manager role

* adds a little carpet

* door access reqs

* original hotel revert

* gitkraken hates me

* swaps out flooring, adds some more lights

* plating

* modularisation

Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-03-03 05:00:11 +00:00
GandalfandGitHub 00763bb6e5 Update icons.dm (#3789) 2021-03-03 04:39:55 +00:00
c765afc23d [MIRROR] Chef Produce Console, for cases where there are no botanists (#3786)
* Chef Produce Console, for cases where there are no botanists (#57298)

* Chef Produce Console, for cases where there are no botanists

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-03-03 03:42:00 +00:00
53938baf04 [MIRROR] Wallets no longer show redundant examine text for ID cards. (#3784)
* Wallets no longer show redundant examine text for ID cards.

* Update wallets.dm

* Update wallets.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-03 02:44:44 +00:00
d42c2c0481 [MIRROR] Announced Extended now sends a report for station traits + minor punctuation cleanup (#3779)
* Announced Extended now sends a report for station traits + minor punctuation cleanup

* Update dynamic.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-03 02:44:32 +00:00
39d795e0ea [MIRROR] HUD cleanup and fixes (#3777)
* HUD cleanup and fixes

* Update _defines.dm

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-03 02:07:50 +00:00
dbe7035f74 [MIRROR] Survival capsules no longer get deleted when deployed at the edge of the map (#3783)
* Survival capsules no longer get deleted when deployed at the edge of the map (#57215)

* Survival capsules no longer get deleted when deployed at the edge of the map

Co-authored-by: Dex <60656530+Ewwmewgewd@users.noreply.github.com>
2021-03-03 02:02:42 +00:00
ac89e30e5b [MIRROR] Japanese Tourists! Oh, and beef stroganoff, I guess! (#3782)
* Japanese Tourists! Oh, and beef stroganoff, I guess! (#57305)

Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>

* Japanese Tourists! Oh, and beef stroganoff, I guess!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
2021-03-03 02:02:34 +00:00
438ce50872 [MIRROR] Fixes the Ratvar ruin on Lavaland (#3780)
* Fix ratvar ruin generation issues (#57233)

Creates a ruin area for the dead ratvar ruin map and remaps to it

* Fixes the Ratvar ruin on Lavaland

Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
2021-03-03 02:02:20 +00:00
0741cd8979 [MIRROR] Refactors A few Simple Mob Footsteps + Fixes Slime Footsteps (#3778)
* Refactors A few Simple Mob Footsteps + Fixes Slime Footsteps (#57261)

* Refactors A few Simple Mob Footsteps + Fixes Slime Footsteps

Co-authored-by: Fox McCloud <Fox-McCloud@users.noreply.github.com>
2021-03-03 02:02:12 +00:00
afa4037317 [MIRROR] Small plant tweaks, addition of chemicals to under utilized plants. (#3776)
* Small plant tweaks, addition of chemicals to under utilized plants (#57302)

* Small plant tweaks, addition of chemicals to under utilized plants.

Co-authored-by: carshalash <carshalash@gmail.com>
2021-03-03 02:01:03 +00:00
1cfa918513 [MIRROR] Operating computers no longer link to stasis beds. (#3775)
* Operating computers no longer link to stasis beds. (#57306)

* Operating computers no longer link to stasis beds.

Co-authored-by: Cimika/Lessie/KathyRyals <65850818+KathyRyals@users.noreply.github.com>
2021-03-03 02:00:30 +00:00
38f5faf0a7 [MIRROR] Fixes surrender alert sticking around forever (#3774)
* Proper source for surrender status effect (#57312)

* Fixes surrender alert sticking around forever

Co-authored-by: Yenwodyah <yenwodyah@gmail.com>
2021-03-03 02:00:20 +00:00
5a0b30616c [MIRROR] Miscellaneous appearance fixes. (#3771)
* Miscellaneous appearance fixes. (#57133)

* Fixes modular computer runtimes

- Adds a proc to eat the source arg of the update icon signal.

* Fixes a couple things not passing the right args

- Fixes the alien leap hallucination passing a string as the first arg to updat_icon
- Fixes the roulette machine passing the payout as the first arg to update_icon.

* Miscellaneous appearance fixes.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-03-03 01:59:21 +00:00
a05f7e863a [MIRROR] Fully implements the ID Card design document (#3729)
* Fully implements the ID Card design document

* Oh fuck that hurt.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 01:54:25 +00:00
bffc27fa0d [MIRROR] [merge with haste, fair maintainers] fixes spellbooks (#3769)
* Fixes spellbooks (#57361)

Spellbooks have an admin_state which means only admins can use it. lmfao.

* [merge with haste, fair maintainers] fixes spellbooks

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-03-02 23:25:17 +00:00
80a864b18f [MIRROR] Tweaks tourist audio (#3766)
* Tweaks tourist audio (#57311)

* done

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

Co-authored-by: AnturK <AnturK@ users.noreply.github.com>

Co-authored-by: AnturK <AnturK@ users.noreply.github.com>

* Tweaks tourist audio

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: AnturK <AnturK@ users.noreply.github.com>
2021-03-02 21:08:37 +00:00
gonenoculer5andGitHub eb803c7c65 Adjusts skyrat nerf to Contractor Batons (#3758)
Makes contractor batons useful again by reverting the damage to something closer to the original damage so that it remains an effective tool.
2021-03-02 19:17:10 +00:00
bd456ea236 [MIRROR] Folders: tgui, refactor, qol (#3764)
* Folders: tgui, refactor, qol (#57320)

Snazzy new UI is always great. Makes folders more fun to use and makes it consistent with the new clipboards

* Folders: tgui, refactor, qol

Co-authored-by: mozi_h <die-123-321@web.de>
2021-03-02 19:12:26 +00:00
25092a85bb [MIRROR] Reworks plumbing reaction chamber, purity support (#3763)
* Rework plumbing reaction chamber, purity support (#57071)

Currently does four things:

The reaction chamber now supports purity! It has a yellow (acid) and green (basic) input for buffers, aswell as a setting to automatically dispense either an acidic or alkalic buffer when above/below a certain pH! Now you can make a 100% pure meth factory! The buffer connects are on an alternate layer.

Probably going to be less loved, but I removed the reaction chambers ability to pick reagents from the net. Instead, it will pull untill a set volume is reached. Then it'll start reacting. While this means that players will have to be more creative and use a wider array of machinery.

Also new machine! Buffers! They fill the hole that reagent chambers left. They can be set with a threshold volume and will only start putting out chems when ALL of their neighbouring buffers also are also above this threshold. You might have a lot of one chem and have to wait for a more specialized chem to be produced, and with the cleverness of reaction chambers gone, bufferers can do just that: wait.

I also removed all but two layers. I want to make it obvious what layer the buffer connects are on. Also layers are basically unusable and I'm gonna give them a rework very soon. I'll put the things back in then when they actually have something to contribute

* Reworks plumbing reaction chamber, purity support

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2021-03-02 19:12:11 +00:00
37ce893873 [MIRROR] SM monitor shows total moles & SM gets it's own defines file. (#3762)
* tgui: Total Moles in SM Monitor, Own Defines File (#57270)

Ever wondered why you failed to setup the scrungularity?

Well, wonder no more! The NT CIMS tab has been made to show total moles. The pressure got kicked however, since it's practically useless. The bar also turns red if your SM is eligible for scrung.

Moved the supermatter defines into it's own files too.

* SM monitor shows total moles & SM gets it's own defines file.

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-03-02 19:11:52 +00:00
cd1c256134 [MIRROR] [TGUI] Wizard TGUI Spellbook + Basic Wizard Loadouts + Randomizer (#3761)
* tgui: Wizard Spellbook, Loadouts, Randomizer (#56958)

Yea, also adds the ability for wizards to choose random spells or some basic loadouts for new players

Loadouts:
Classic, gets some of the oldest spell combos known to man, good starter for new players.
Mjolnir, gets mjolnir hammer and a bunch of buffs and summon item to keep it. Also good bashy fun!
Fantastical Army, gets just a ton of things that create mobs, allied and not. Maybe hard to get the ball rolling but a good setup.
Soul Tapper, you are full of long cooldown spells and you can refresh them with Soul Tap. You can switch bodies with mindswap to get more max health back, just remember your robes!

Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* [TGUI] Wizard TGUI Spellbook + Basic Wizard Loadouts + Randomizer

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-03-02 19:11:31 +00:00
558e17d1f7 [MIRROR] Working portable atmos reactions (#3759)
* Working portable atmos reactions (#57211)

* Working in canister reactions

* same for pumps

* and scrubbers

* Working portable atmos reactions

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-03-02 19:11:14 +00:00
a1a2a7acf5 [MIRROR] Fixes TRAIT_NOBREATH crit damage being applied after death (#3756)
* Fixes TRAIT_NOBREATH crit damage being applied after death (#57220)

* Fixes TRAIT_NOBREATH crit damage being applied after death

Co-authored-by: Hadzabadza <hadzabadza@yandex.ru>
2021-03-02 16:10:46 +00:00
SwiftfeatherandGitHub 97aa813f28 [NONMODULAR] [FUCK] FIX FOR BLOBS BLOWING UP STATION WITH NUKE VORE (#3760)
* just a temp fix

* EYYY STATION NO longer nuked bY BLOB LMAO
2021-03-02 12:08:26 +00:00
Yawet330andGitHub e7d29c854e [NONMODULAR]Brings Noc regen in line with starlight and fleshmend (#3739)
* Brings Noc regen in line with starlight and fleshmend

* man im dumb
2021-03-01 22:30:12 +00:00
a98cab69ce [MIRROR] Hulks can shove on combat mode like non-hulks (#3747)
* Hulks can shove on combat mode like non-hulks (#57275)

* Hulks can shove on combat mode like non-hulks

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-01 22:29:36 +00:00
89a5f7e7e4 [MIRROR] Fixes the randomly failing unit test that sometimes happens. (#3746)
* Fixes the randomly failing unit test that sometimes happens. (#57266)

* Fixes the randomly failing unit test that sometimes happens.

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-03-01 22:29:21 +00:00
5564e0a929 [MIRROR] Luxury bar capsule no longer throws a runtime when deployed (#3743)
* Luxury bar capsule no longer throws a runtime when deployed (#57291)

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* Luxury bar capsule no longer throws a runtime when deployed

Co-authored-by: Dex <60656530+Ewwmewgewd@users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
2021-03-01 22:28:50 +00:00
c5ee4b786c [MIRROR] Ethereals can now scream (#3742)
* Ethereals can now scream (#57276)

* Ethereals can now scream

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-03-01 22:28:23 +00:00
8fb327259b [MIRROR] Shapeshifting runtime fix (#3740)
* Shapeshifting runtime fix (#57286)

Fixes a runtime when shapeshifting into any form due to a wrong parenthesis for ventcrawling flags

* Shapeshifting runtime fix

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-03-01 22:27:04 +00:00
SwiftfeatherandGitHub f57876ff61 Sepia/lightpink (#3689)
lightpink down to 25% speed buff from 50%, sepia speed buff down to 20% from 50%, wth a possible slowdown of 10%
2021-03-01 18:14:05 +00:00
90bac01c12 [MIRROR] Replaces old array sprites (#3736)
* Replaces old array sprites

* Update collector.dm

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-01 18:12:37 +00:00
e63094d9ae [MIRROR] adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs (#3737)
* adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs (#57263)

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

* adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-01 17:55:55 +00:00
537ac5e245 [MIRROR] Adds basic cybernetic eyes to the medical protolathe/exofabricator (#3735)
* Adds basic cybernetic eyes to the medical protolathe/exofabricator (#57245)

* Makes the basic cybereyes flash vulnerable, puts the equal to normal eyes in the cybernetic organ node, makes the normal cybereyes prone to fizzling upon being emp'd

* Adds basic cybernetic eyes to the medical protolathe/exofabricator

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-03-01 17:49:45 +00:00
f5083f498b [MIRROR] *smacks table* Hot Damn! (#3734)
* *smacks table* Hot Damn! (#57269)

* *smacks table* Hot Damn!

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-01 17:49:38 +00:00
212372129b [MIRROR] Water bottles now work properly in combat mode (#3733)
* Water bottles now work properly in combat mode (#57255)

* Water bottles now work properly in combat mode

Co-authored-by: Dex <60656530+Ewwmewgewd@users.noreply.github.com>
2021-03-01 17:49:19 +00:00
38240f0df3 [MIRROR] Allow admins to cancel dynamic midround events (+ another 2 year old Dynamic fix!) (#3732)
* Allow admins to cancel dynamic midround events (+ another 2 year old Dynamic fix!) (#57248)

Admins will now be warned with a 10 second timer about a midround event. They will have the option to cancel it, or to replace it with a different midround event.

Fixes a bug where the "Execute" midround ruleset button would not force the chance correctly (FUCK the term "dry_run").

Moves out dynamic ruleset picking to its own file, as in line with the rest of the code splitting I've done. Makes it nicer to work with, as opposed to a several thousand line script.

* Allow admins to cancel dynamic midround events (+ another 2 year old Dynamic fix!)

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-03-01 17:49:12 +00:00
3dc5cff82d [MIRROR] Crystallizer Hotfix (mistakes were made) (#3724)
* fex (#57256)

Fixed crystallizer, now working properly, the GUI was broken when i changed name of a var, now the gui works again, also the internal gasmixture wasn't initialized anymore for some reason

Zaukerite and SM shard cost a bit less now (was intended to be changed in the main PR but i forgot)

* Crystallizer Hotfix (mistakes were made)

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-02-28 23:47:38 +00:00
c6160b94dc Ethereals now crystalize on death, allowing them to heal themselves unless the crystal is destroyed, but giving them a brain trauma if it succeeds. (#3723)
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-28 23:47:28 +00:00
c1a5727026 [MIRROR] Fixes borg module buckets dropping to the floor (#3722)
* Makes borgs unable to self-bucket hat (#57257)

Adds a check when someone tries to put a hat on a borg to make sure a borg can't put one of its own modules on itself, preventing janiborgs from having nodrop borg module buckets on their head

Also makes thrown hats respect nodrop hats that are already worn, so that you can't easily remove a placed nodrop hat with any old hat.

Prevents janny borgs from memeing on people by giving them a cursed bucket that fuses with their hand and utterly ruins their day.

* Fixes borg module buckets dropping to the floor

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-02-28 23:47:21 +00:00
b7da8c2269 [MIRROR] Adds new station traits that gives departments / everyone death rattle implants (#3683)
* Adds new station traits that gives departments / everyone death rattle implants

* Update jobs.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-28 19:40:35 +00:00
OrionTheFoxandGitHub 2fd0604f1b Finish "Utility Port" (#3707)
* Finish "Utility Port"

Ports the rest of the paired items with those in the Utility Port, including departmental jackets. Also tweaks a few of the uniforms in the Utility port (such as making chem-haz uniforms actually acid-proof)

* ABRBR NEWLINES

/Insert swearwords here/

* N E W L I NE

i swear to fuck

* fix armor value formatting

whooops
2021-02-28 19:30:03 +00:00
GandalfandGitHub 0a0d1df0f9 Putting your hand in the food processor without due care is bad (#3718)
* a

* Update processor.dm

* Update processor.dm
2021-02-28 16:37:33 +00:00
5ea469fcf0 [MIRROR] Fix a number of build issues (#3716)
* Fix a number of build issues

* Update babel.config.js

* Update package.json

* Update package.json

* Update dreamseeker.js

* Update package.json

* Update webpack.config.js

* Update yarn.lock

* a

* a

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-28 15:28:03 +00:00
GandalfandGitHub 4f3ad4d7ef CQC+ (#3610)
* a

* Update cqcplus.dm

* Update cqcplus.dm

* Update cqcplus.dm

* Update cqcplus.dm

* Update uplink_items.dm
2021-02-28 15:22:40 +00:00
4032c73891 [MIRROR] Fermichem 2.4 - C2 medicine recipe adaptations and atunements to the new mechanics (#3701)
* Fermichem 2.4 - C2 medicine recipe adaptations and atunements to the new mechanics

* Update human_defense.dm

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-28 15:21:34 +00:00
9b408206ec Prisoner flavour text (#3713)
* Updates all maps to TG standards

Massive changes and bugfixes from TG ported over to our maps.
Sorry for whoever I conflict.

* Missed Icebox Heaters PR

* Latejoin text to prisoners

* examples of shittery

because I was asked to
hopefully people read this

* Update code/modules/jobs/job_types/prisoner.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-28 15:21:12 +00:00