Commit Graph

733 Commits

Author SHA1 Message Date
BluBerry016
67c5c2fec0 Reverts Shipstation (#5414) 2021-05-02 22:58:31 +01:00
SkyratBot
966873beb4 [MIRROR] [READY] Tile Reskinning 2: Epic Winaloo (#5384)
* [READY] Tile Reskinning 2: Epic Winaloo

* AAA

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-01 14:25:42 +01:00
SkyratBot
6eb42f889d [MIRROR] Fixes incorrect unwrapping message, and now mail doesn't get sent to... BAD recipients. (#5232)
* mail fixes 😎 (#58716)

now mail doesn't get sent to... BAD recipients. (Antags arm, just say antags)
fixes incorrect unwrapping message (bad usage of a visible message)
mail recipients wasn't shuffling either. I'm fairly certain this was leading to some people always getting mail and some never getting it.

* Fixes incorrect unwrapping message, and now mail doesn't get sent to... BAD recipients.

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-27 00:01:18 +01:00
SkyratBot
4b7a149fb9 [MIRROR] Fixes mail multiplying in a hellish race to Avogadro's number (#5175)
* Fixes mail multiplying in a hellish race to Avogadro's number

* Update supply.dm

* Update supply.dm

* Update supply.dm

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:41:33 +01:00
SkyratBot
c418b139be [MIRROR] Ports Mail From Kiwi Take 2: Arconomy Class Mail (#5172)
* Ports Mail From Kiwi Take 2: Arconomy Class Mail

* Update wardrobes.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:20 +01:00
SkyratBot
96c0c9527e [MIRROR] Removes drone restrictions from bardrone (#5078)
* Bardrone can bardrone again (#58505)

* Removes drone restrictions from bardrone

Co-authored-by: Yenwodyah <yenwodyah@gmail.com>
2021-04-22 00:41:02 +01:00
Gandalf
a8fd322fa1 Update emergency.dm (#5009) 2021-04-18 16:21:53 +01:00
Gandalf
f136e49b88 Actually fixes mining maps lol (#4968)
* Update mining_maps.dm

* Update mining_maps.dm

* a

* aaa

* aaaa

* Update mining_maps.dm

* aaaaa
2021-04-17 15:52:34 +01:00
SkyratBot
187119d985 [MIRROR] Security Level subsystem (#4809)
* Security Level subsystem

* aaa

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-11 00:11:52 +01:00
SkyratBot
574ce13181 [MIRROR] [s] Restores Cargo Shuttle Blacklist Enforcement (#4731)
* [s] Restores Cargo Shuttle Blacklist Enforcement (#58201)

Removed an inappropriate as anything inside the cargo shuttle's blacklist check that was breaking it.

* [s] Restores Cargo Shuttle Blacklist Enforcement

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2021-04-08 03:06:21 +01:00
Gandalf
1954309ee3 Shuttle landing and takeoff sounds (#4702)
* aaaa

* Update shuttle.dm

* Update shuttle.dm

* Update shuttle.dm

* Update shuttle.dm

* Update shuttle.dm

* Update shuttles.dm
2021-04-07 18:09:48 +01:00
Gandalf
31c8d7ca34 Massive shuttle refactor and arrivals system change (#4572)
* FIRST!!

* aaaa

* Update floor.dm

* aaaaaaaa

* aaaaaaaaaaaaaaaaaaaaaa

* aaaaaaaaaaa

* Update CentCom_skyrat_z2.dmm

* Update MetaStation_skyrat.dmm

* aaaaaaaaaaaaaaaaaaaaa

* crashing this shuttle with no survivors

* aaaaaaaaaaaaaaaaaaaaaa

* aaaaaaaa

* aaaaaaaa

* Update emergency.dm

* aaaaa

* Update emergency_skyrat.dmm

* Update emergency_skyrat.dmm

* aaaaa

* a
2021-04-05 14:49:02 +01:00
SkyratBot
b261424aaa [MIRROR] Fixes a minor oversight with eigenstasium (#4587)
* Fixes a minor oversight with eigenstasium (#58069)

* Fixes a minor oversight with eigenstasium

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-04-02 01:35:55 +01:00
Gandalf
d14f4ea7c9 Revert "Revert "[MIRROR] Layer overhaul (#4503)" (#4509)" (#4536)
This reverts commit b27ede689e.
2021-03-31 02:08:56 +01:00
Useroth
b27ede689e Revert "[MIRROR] Layer overhaul (#4503)" (#4509)
This reverts commit 8ac892d340.
2021-03-30 23:45:08 +01:00
SkyratBot
8ac892d340 [MIRROR] Layer overhaul (#4503)
* Layer overhaul (#57915)

## About The Pull Request
Changes up some layer and plane defines for no particular reason lol

## Why It's Good For The Game
Planes actually override layers, and layers control ordering within planes. A lot of the usage of plane and layer was wholly unnecessary. This refactor helps future maintainability while also being needed staging for _future features._

* Layer overhaul

* aaaaaaaaa

a

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-29 16:36:36 +01:00
BluBerry016
8f0d691d5d [Semi-Modular] OutpostStation's Revengeance (#4142)
* Remember the last time this was ran? I do.

* bruhmin

* Update outpoststation.dmm

* nukes some bad wiring practices

* chaplain's gunk

* Update outpoststation.dmm

* navbeacons

* Update outpoststation.dmm

* Update outpoststation.dmm

* Update outpoststation.dmm

* Implements most of Orion's suggestions

* Implements LeChatGuide's Suggestions

* Removes the last remnant of the fucking blast doors in engineering that I missed

* Update outpoststation.dmm

* Update outpoststation.dmm

* Implement's kaths suggestions

* Update outpoststation.dmm

* maintenance change

* Prison/vault update

* Update outpoststation.dmm

* Update outpoststation.dmm

* Update outpoststation.dmm

* Update outpoststation.dmm

* Update outpoststation.dmm

* Update emergency_outpost.dmm

* Update outpoststation.dmm

* Outpost whiteship fiex

* thermomachine feex

* drone/chem update
2021-03-28 22:50:58 +01:00
SkyratBot
ac243ebb9f [MIRROR] Syndicate Shuttle Console cannot be deconstructed via tools (#4448)
* Syndicate Shuttle Console cannot be deconstructed via tools (#57962)

* Syndicate Shuttle Console cannot be deconstructed via tools

Co-authored-by: bloons3 <bloons3@users.noreply.github.com>
2021-03-27 14:18:42 +00:00
Gandalf
e1456b0cf6 Massive announcer/BSA overhaul (#4254)
* oh yeehaw

* Update default_announcer.dm

* a

* Update sound.dm

* Delete poweroff.ogg

* pref+newshit!

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* a

* Update set_security_level.dm

* a

* a

* a

* Update default_announcer.dm

* a

* a

* Update priority_announce.dm

* a

* Update priority_announce.dm

* ERT NOW HAS AN ALERT OPTION

* more changes to sounds! ALERTS

* Update set_security_level.dm

* THSI IS THE WAYSDFSASA

* you think you've seen shitcode? just you wait cowboy.

* a

* Update set_security_level.dm

* Update default_announcer.dm

* Update set_security_level.dm

* Update set_security_level.dm

* Update gravitygenerator.dm

* BSA AND FIXES!

* a

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* aaaaaaaaaaaaaa

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* a

* autodocker

* Update modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm

Co-authored-by: Azarak <azarak10@gmail.com>
2021-03-23 00:16:26 +00:00
BluBerry016
681abf913f whiteship feex (#4327) 2021-03-22 17:49:08 +00:00
SkyratBot
9ffdf58259 [MIRROR] Some explosions code cleanup (#4276)
* Some explosions code cleanup (#57493)

Clears out two deprecated explosions systems (explosion ids and explosion levels)
Refactors a bunch of contents_explosions procs to be maybe slightly faster.
Cleans up a bunch of ex_act code.
Slightly cleaner code
A few less unused vars on /atom and /turf

* Some explosions code cleanup

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-03-21 01:03:36 +00:00
SkyratBot
38c2e65e01 [MIRROR] Adds Armhulen's PR of Dennok's shuttle decal PR with Mothblocks' reviews (#3953)
* Adds Armhulen's PR of Dennok's shuttle decal PR with Mothblocks' reviews (#57456)

Co-authored-by: Dennok <Deneles@ yandex.ru>
Co-authored-by: Couls <coul422@ gmail.com>
Co-authored-by: TiviPlus <57223640+TiviPlus@ users.noreply.github.com>
Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds Armhulen's PR of Dennok's shuttle decal PR with Mothblocks' reviews

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Dennok <Deneles@ yandex.ru>
Co-authored-by: Couls <coul422@ gmail.com>
Co-authored-by: TiviPlus <57223640+TiviPlus@ users.noreply.github.com>
Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-06 23:11:04 +00:00
SkyratBot
ba02b2094d [MIRROR] Minor typo and comment fixes follow-up for ID card rework (#3830)
* Minor typo and comment fixes follow-up for ID card rework (#57318)

* Minor typo and comment fixes follow-up for ID card rework

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-03-04 01:03:09 +00:00
SkyratBot
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
SkyratBot
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
SkyratBot
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
SkyratBot
e15aff7b96 [MIRROR] Escape pod console emag fix (#3708)
* Escape pod console emag fix (#57229)

* Escape pod console emag fix

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-02-28 12:23:37 +00:00
SkyratBot
1f665ef7f7 [MIRROR] Beauty is now an element. Fixing an issue with enter/exit area comsigs. (#3639)
* Beauty is now an element. Fixing an issue with enter/exit area comsigs. (#57147)

Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>

* Beauty is now an element. Fixing an issue with enter/exit area comsigs.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>
2021-02-25 13:37:25 +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
NotRanged
f4623e0a2d [Modular] Ports the bluespace locker from oldskyrat (#2962)
* everything but da map

* everything but da map

* Makes it work ~somehow~, I have genuinely no clue why 

Stumbled upon the fix by pure luck

* Trailing newline

* . = ..()

* what the fuck?

* this works

* mapping is pain

* why tf is the CI failing, run it again

* hhh

* wack

* Resolves map conflict

* a

* Actually solves the conflict now

* please

* Webedit spacebar to rerun CI

* i swear to fucking god

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* id console -> modular console

* Rerun CI

* deletes the fucking map

* fixes the merge conflict AGAIN

Co-authored-by: Ranged <nickvanderkroon@gmail.com>
2021-02-18 19:23:22 +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
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
cc9ef500c7 [MIRROR] repaths plasteel tiles to iron (#3155)
* repaths plasteel tiles to iron

* Update robot_modules.dm

* a

* fuck me

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:29:36 +00:00
SkyratBot
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
Gandalf
34d8917ebc Aesthetics fixes (#2986)
* fixes

* a
2021-01-31 16:40:05 +00:00
SkyratBot
577db30351 [MIRROR] Regular CTF no longer has wounding (#2652)
* Regular CTF no longer has wounding (#56093)

🆑 coiax
tweak: Regular Capture-The-Flag players can no longer be wounded.
Simulated participants in the Medieval Shuttle can still be violently
murdered with wounds however.
/🆑

CTF is very fast paced, and if you've taken damage without your shield,
you are nearly dead most of the time. However, if you do survive, you're
supposed to slowly heal, but wounds are untreatable on the battlefield.

People still being able to be bloodily stabbed in the Medieval Shuttle
is definitely a feature.

- Aliens (xenomorphs) are still immune to wounds, but that immunity is
  now done with a trait, rather than a typecheck.

* Regular CTF no longer has wounding

Co-authored-by: coiax <jack@billbuddy.co.uk>
2021-01-12 02:04:03 +01:00
SkyratBot
f79e91462c [MIRROR] LINDA Reforged (#2573)
* LINDA Reforged

* Update airlock.dm

* Update biohazard_blob_controller.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-08 18:52:35 +01:00
SkyratBot
f3dfe15c10 [READY] Hark! The Medieval Reality Simulation Dome Emergency Shuttle! (+speech mutation, NOTELEPORT fixes and teambuilder improvements) (#2505)
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-01-05 17:17:26 +01:00
SkyratBot
89d895b386 [MIRROR] Assault pod launch fix (#2394)
* Merge pull request #55771 from Arkatos1/podFix

Assault pod launch fix

* Assault pod launch fix

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
2020-12-31 01:39:50 +00:00
SkyratBot
6355c9917e [MIRROR] Export scanner doesn't need to link + old bounty code is gone (#2197)
* Export scanner doesn't need to link + old bounty code is gone (#55504)

Removes the Export scanner's need to link with a console and cleans up the old bounty code

* Export scanner doesn't need to link + old bounty code is gone

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
2020-12-17 08:02:12 +01:00
SkyratBot
f105b47a55 [MIRROR] Singularity component (#2082)
* Singularity component (#55096)

Adds singularity component

* Singularity component

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-12-08 11:30:39 +00:00
SkyratBot
f05336728e [MIRROR] Luxury shuttle scanner gate bugfixes and improvements (#1993)
* Luxury shuttle scanner gate bugfixes and improvements (#55107)

Oh man this one took me a hot second.
Luxury Shuttle gates now do the following:

Respect simplemobs dragging through credits so they can be considered legitimate passengers.

Respect vehicles and by proxy mechs so that you don't block the narrow causway into the shuttle. Entering the gate with cash will add both yourself and the vehicle to the whitelist. Entering the gate in a whitelisted vehicle, but without paying yet will throw angry buzzing at you as expected.

The shuttle will only take the correct credit count now, or at least provide the correct change.

The scanner is now invincible as it LITERALLY only exists on a roundend shuttle.

* Luxury shuttle scanner gate bugfixes and improvements

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-12-01 17:48:20 +00:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
d31c091c10 [MIRROR] You can no longer hijack a BYOS before it's "docked" (#1926)
* the flight plans filed with the agency lists etc etc (#55214)

Someone reported an issue on the discord where, since BYOS shuttles now have shuttle computers, they can now be hijacked partially or completely before it's actually time for evac. This has been confirmed as unintended behavior by anne, who submitted the hijack rework port, so this PR fixes that by requiring the shuttle to have at least "docked" before the ability to hijack it is available

* You can no longer hijack a BYOS before it's "docked"

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-11-29 16:06:53 +00:00
Azarak
491d9f48a2 aaa (#1910) 2020-11-28 17:18:33 +00:00
SkyratBot
098e1fe440 [MIRROR] Removes unintentional garbleing in a garbled message (#1683)
* Removes unintentional garbleing in a garbled message (#54913)

* Removes unintentional garbleing in a garbled message

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
2020-11-14 21:32:27 +01:00
SkyratBot
e768cef297 [MIRROR] /obj/screen --> /atom/movable/screen (#1646)
* /obj/screen --> /atom/movable/screen

* Update storage.dm

* Update radial.dm

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-11-11 04:12:50 +01:00
SkyratBot
4af1148b13 [MIRROR] Non-human mobs can now benefit from held id cards and economy. (#1603)
* Non-human mobs can now benefit from held id cards and economy. (#54647)

* Non-human mobs can now benefit from held id cards and economy.

* Moved these getters toward the upper end.

* oui?
...
dump eet.

* .tee pump
      ...
     ?iuo

* Non-human mobs can now benefit from held id cards and economy.

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-11-07 05:08:36 +00:00
SkyratBot
e646c6d764 [MIRROR] Adds shuttle hijack logging. (#1595)
* Adds shuttle hijack logging. (#54827)

Adds game logging and sends an admin message on shuttle hijack attempts. Simples!

* Adds shuttle hijack logging.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-11-07 05:04:45 +00:00
SkyratBot
d1315d9474 [MIRROR] Audio falloff re-work, and increased audio range. (#1406)
* Audio falloff re-work, and increased audio range.

* a

* a

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-21 07:36:31 +02:00