Commit Graph

36 Commits

Author SHA1 Message Date
lukevale
2b38953932 [SEMI-MODULAR] Underwear and Bra split (#23269)
* First go, should be all set.

* Adds SKYRATS additions

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* code markings

* modular code markings

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* modular code markings

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* shuffle socks and undershirt color

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* adds a space and sanitizes

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* various comment and modular fixes

* more spacing

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* more spacing

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* various spacing fixes

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* variable comment

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Fixes a dumb oversight

* fixes the return list.

* converts the bras properly

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* fixes the overlaying issue.

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* adds the space

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* adds the descrptiors to changling vars

* Fixes a small oversight

* hard resolves the conflict by merging safekini

* Removed a duplicated proc

* Reverted Baby-Doll to Babydoll (for simplicity in the future)

* Implement the migration for bras from the various sources it could come from

Also cleans up some of the code in that file, so that should help nicely.

* Fixed the bikini underwear update

* Fixed issue with migrating the safekini

* sets the binder to be a bra.

* disables the bra as a undershirt

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2023-09-23 13:40:30 -04:00
SkyratBot
87bfa7a61a [MIRROR] Fixes typo 'transfered', olive oil reaction repath [MDB IGNORE] (#23469)
* Fixes typo 'transfered', olive oil reaction repath

* Modular

* Update condiment.dm

* Update recipes_guide.dm

* Update _cup.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-09-04 08:49:33 -04:00
SkyratBot
f8b2329771 [MIRROR] Fixes issue where role banned players can still play roles they're banned from. [MDB IGNORE] (#23399)
* Fixes issue where role banned players can still play roles they're banned from.

* Update sql_ban_system.dm

* Some formatting updates

---------

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-08-31 00:10:42 -04:00
SkyratBot
7a9f5f2eeb [MIRROR] Mob spawners now return their created mob after create_from_ghost [MDB IGNORE] (#22132)
* Mob spawners now return their created mob after create_from_ghost (#76371)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

create_from_ghost() now returns the body it produces.

This should fix the pirate/fugitive ghost orbit notifications, since
they expect to have a mob returned by this proc. Since the mob they
expect to be returned is used as the subject for the ghost orbit popup,
the popup would have no source and end up being blank.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Players selected to play pirate/fugitive will now have a functioning
orbit popup.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Mob spawners now return their created mob after create_from_ghost

---------

Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
2023-06-30 23:20:28 -07:00
SkyratBot
09e8da1fc6 [MIRROR] Fixes infinite ghost role spawners not being infinite [MDB IGNORE] (#19973)
* Fixes infinite ghost role spawners not being infinite (#74090)

## About The Pull Request
I love it when we add something and we have like three PRs around the
same time touching the same code and none of it conflicts, it's awesome,
believe me!

Adds the `!infinite_use` to the other check that checked the uses left,
to ensure that it still allows infinite spawners to remain infinite.

## Why It's Good For The Game
Code that works is always good for the game.

## Changelog

🆑 GoldenAlpharex
fix: Ghost role spawners that are set to have infinite uses no longer
run out of uses.
/🆑

* Fixes infinite ghost role spawners not being infinite

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-03-19 07:59:18 -07:00
SkyratBot
241d71f6fe [MIRROR] Fixes ghost role spawners not allowing you to spawn as more than one ghost role per round [MDB IGNORE] (#19839) 2023-03-13 21:14:47 -07:00
SkyratBot
484a9a32d9 [MIRROR] Fixes the issues with ghost role spawners being able to spawn userless bodies [MDB IGNORE] (#19817)
* Fixes the issues with ghost role spawners being able to spawn userless bodies

* Fixes da conflict yo

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2023-03-13 12:09:19 -04:00
SkyratBot
c338382a18 [MIRROR] Fixes runtime in golem body swap, Fixes some hard deletes assocaited with golems and mind masters [MDB IGNORE] (#19400)
Fixes runtime in golem body swap, Fixes some hard deletes assocaited with golems and mind masters

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-03-10 02:40:37 +00:00
SkyratBot
6267035649 [MIRROR] Fixes pirates and starfury assailants transferring minds [MDB IGNORE] (#19724)
* Fixes pirates and starfury assailants transferring minds (#73833)

## About The Pull Request

Same issue as before, these skipped the spawn step and snowflaked their
own creation process.

So I split off the create part of attack ghost so these could share.

Fixes #73823 , may fix also #73822 but I don't *think* it will, whatever
changed spawners a few months ago is a little sus

## Why It's Good For The Game

Changeling pirate bad

## Changelog

🆑 Melbert
fix: Fixes pirates and starfury assailants keeping minds of past lives
/🆑

* Fixes pirates and starfury assailants transferring minds

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2023-03-08 11:36:36 +00:00
SkyratBot
16a0754cc2 [MIRROR] Allows mob spawners to be infinite [MDB IGNORE] (#19648)
* Allows mob spawners to be infinite (#73726)

## About The Pull Request

Gives a more 'proper' way for mob spawners to be infinite than just "set
a very large number".

## Why It's Good For The Game

Useful for admins

## Changelog
not really player facing

* Allows mob spawners to be infinite

---------

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2023-03-04 12:57:33 +00:00
SkyratBot
86261577ae [MIRROR] Fixes ghost roles keeping antag datums [MDB IGNORE] (#19484)
* Fixes ghost roles keeping antag datums (#73568)

## About The Pull Request

I made it so mob spawners transfer existing minds because of golem
shells but ghosts have minds on occasion.

Disassociates mind before spawning from ghosts.

## Why It's Good For The Game

Wizard golems Fixes #73577

## Changelog

🆑 Melbert
fix: Ghost roles from spawners keeping antag datums
/🆑

* Fixes ghost roles keeping antag datums

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2023-02-21 19:06:23 -08:00
SkyratBot
be45c18c96 [MIRROR] Don't print a misleading message when not picking a spider. [MDB IGNORE] (#19429)
* Don't print a misleading message when not picking a spider. (#73483)

## About The Pull Request

Fixes #73468
The admin message in `mob_spawn/ghost_role/attack_ghost` was warning
admins any time a ghost role spawner did not create a mob, however
clicking a spider egg opens a radial menu. Neglecting to choose one of
the options (and closing the menu) does not return a mob, and was
implying that some kind of error occurred when this is actually expected
behaviour.

Also as noted in the comments this probably needn't message admins in
the first place, we now log it as a crash instead.

## Why It's Good For The Game

We shouldn't print a log message in admin chat for expected behaviour.
Logging changes will help diagnose if this was masking an _actual_ bug.

## Changelog

🆑
fix: Clicking a spider egg and then closing the radial menu won't print
a message in admin channel informing admins that the egg didn't spawn
anything.
/🆑

* Don't print a misleading message when not picking a spider.

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
2023-02-18 19:25:12 -08:00
SkyratBot
10358e3bf4 [MIRROR] Fixes ghost roles trying to spawn people when there /should/ be zero uses left [MDB IGNORE] (#19265)
* Fixes ghost roles trying to spawn people when there /should/ be zero uses left

* uhh ok

---------

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2023-02-12 22:19:28 -08:00
SkyratBot
8f134af3e6 [MIRROR] Adds plasmaman support to mob spawners [MDB IGNORE] (#19054)
Adds plasmaman support to mob spawners (#73068)

## About The Pull Request

A very minor change but one that will save headache down the line. Adds
plasmaman support to mob spawners, meaning they will be guaranteed to
get their internals and suit upon spawning from those.

Modified the equip proc to be able to automatically turn hand slot
internals on without the need for snowflakey open_internals checks
everywhere, as that should already handled by the it (shown below). Just
modified it to work on hand slots.


4b832e7d01/code/datums/outfit.dm (L245-L248)

## Why It's Good For The Game

Adds support for present and future mob spawners involving plasmapeople.

## Changelog

🆑
qol: prevents mob spawner plasmamen from spawning without their suit and
internals.
code: the equip proc can now find internals in the hand slot and
automatically open them, allowing for less snowflakey code down the
line.
/🆑

---------

Co-authored-by: Bloop <vinylspiders@gmail.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2023-01-31 13:52:18 +00:00
Funce
60bfb76832 [MIRROR] Dynamic Human Icon Generation For Simple/Basic Mobs (& Cardboard Cutouts) [MDB IGNORE] (#18884)
* Dynamic Human Icon Generation For Simple/Basic Mobs (& Cardboard Cutouts) (#72517)

revive of #68760
this time a proc, not an element
this time supports cardboard cutouts
this time supports mob corpses

![image](https://user-images.githubusercontent.com/23585223/211064291-81070650-189f-4afa-8116-81b687e3ea35.png)

prevents these icons ever being outdated, they'll always look what they
are supposed to, saves spriting work

🆑 Fikou, a hood by Viro
refactor: humanoid mobs and cardboard cutouts automatically generate
their sprites, they no longer will be outdated
/🆑

Co-authored-by: Time-Green <timkoster1@hotmail.com>

* Modular!

* Fix signal override merge skew (#72882)

Caused by https://github.com/tgstation/tgstation/pull/72517, with
https://github.com/tgstation/tgstation/pull/72561 raising an error that
was being hidden before

This changes equip logic somewhat so that set_wearer was being called
twice.

I don't think this should be being run in visualsOnly at all, as it does
a ton of stuff like registering signals, updating UI, etc etc etc. Don't
have time to investigate further.

---------

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Time-Green <timkoster1@hotmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2023-01-27 13:56:00 -05:00
SkyratBot
2b800b9a23 [MIRROR] Removes tablets (not PDAs) entirely. [MDB IGNORE] (#17880)
* Removes tablets (not PDAs) entirely.

* contractor changes

* map changes

* Update assistant.dm

* conflicts

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-12-07 01:07:02 +00:00
GoldenAlpharex
a238c0a6fb Fixes the ghost role spawner spawning a naked human while waiting on you to decide whether you want to use the character from your preferences or not (#17319)
Fixes the ghost role spawner spawning a naked human while waiting on user input
2022-11-15 06:44:17 -08:00
Zonespace
f7c26bbf25 515 Compat (#17465)
* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2022-11-15 06:59:06 +00:00
SkyratBot
097e913e4b [MIRROR] Removes tablet hard drives entirely (HDD & SSD) [MDB IGNORE] (#17164)
* Removes tablet hard drives entirely (HDD & SSD)

* map updates

* changes

* contractor uplink theme

* uplink improvements

* tab

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-26 14:09:16 -04:00
SkyratBot
58752b0969 [MIRROR] Removes a ton of unused tablet vars, re-organizes the rest [MDB IGNORE] (#17014)
* Removes a ton of unused tablet vars, re-organizes the rest (#70344)

* Removes a ton of unused vars, re-organizes the rest

Removes a ton of unused vars from Modular computers
Re-organizes the rest, and adds autodoc comments to most of them
Moved 2 vars (saved_image and invisible) from the tablet to the messenger app, since that's where it was used. I didn't see the point of having these vars be on every computer anyways, only PDAs have the app.
Renames Clown's honk virus var
Makes Messenger app's saved image, actually used.

* static list and NODECONSTRUCT_1 check

* oops

* Removes a ton of unused tablet vars, re-organizes the rest

* cryopod

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-20 02:28:27 -04:00
jjpark-kb
62345b01c1 incompatible species for ghostroles, and character pref for black market dealer (#16430)
* incompatible species for ghostroles

* Update code/modules/mob_spawn/mob_spawn.dm

adds a space?

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/mob_spawn/mob_spawn.dm

add a space.

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-09-26 17:32:08 -04:00
SkyratBot
4f430ec4be [MIRROR] Refactor hardcoded suit sensor defines [MDB IGNORE] (#15601)
* Refactor hardcoded suit sensor defines (#69164)

* Refactor suit sensor defines

* Add suit sensor define to HoS suit

* Fix sensor_mode define to be accurate

* Refactor hardcoded suit sensor defines

Co-authored-by: Tim <timothymtorres@gmail.com>
2022-08-13 17:33:02 -07:00
SkyratBot
ac31a4639e [MIRROR] Concentrated barbers aid can give hairless species hair + fixes hair updating once and for all (probably) [MDB IGNORE] (#15182)
* Concentrated barbers aid can give hairless species hair + fixes hair updating once and for all (probably)

* Update code/modules/antagonists/thief/thief.dm

* Update code/modules/mob/living/carbon/human/species_types/felinid.dm

* Concentrated barbers aid can give hairless species hair + fixes hair updating once and for all (probably)

* yes

* Update _compile_options.dm

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-08-08 02:45:30 +01:00
SkyratBot
6016cf97b4 [MIRROR] individual LOG_GAME [MDB IGNORE] (#15401)
* individual LOG_GAME

* e

* Update teleporter.dm

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-08-08 01:11:55 +01:00
SkyratBot
3a8bed771a [MIRROR] [READY] Venus human trap fix 3.0: Allow ghosts to possess them even when obscured, use better spawning system [MDB IGNORE] (#15090)
* [READY] Venus human trap fix 3.0: Allow ghosts to possess them even when obscured, use better spawning system

* Fixes the merge conflict!

* Fixes ghost role spawners not being covered by the ghost role spawner ban

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-07-24 13:23:30 +01:00
Tom
817f8b1f52 Ghost role appearance change restriction (#12956)
* Ghost role appearance change

* update black mesa
2022-04-23 22:06:19 +01:00
Tom
478934e458 mob spawn species lock to balloon alert (#12955) 2022-04-21 14:40:33 +01:00
magatsuchi
dc8adc2924 Modular Tablets: Converting PDAs to the NtOS System (SKYRAT VERSION) (#12920)
* hot-patch 1

* hot patch 2

* hot patch 3

* slight issue
2022-04-20 16:55:49 +01:00
Tom
1b3158ae3c Ghost role loadout/quirk fix (#12537) 2022-04-06 02:29:03 +00:00
Gandalf
abb63c7c21 oops 2022-03-13 23:09:13 +00:00
Gandalf
c1c39e98fd Species lock for ghost spawners (#12061)
* 0

* E

* Update enclave_pirates.dm

* E

* e
2022-03-13 17:34:58 -04:00
Tom
560a29469f [Semi-Modular] Allows ghost roles to use loadouts & quirks (#11175)
* Gives ghost roles loadouts

* add quirks

* quirk & loadout toggle per spawner
2022-02-02 15:38:18 -05:00
Gandalf
e2a693e962 Fixes ghost role spawners (#10290)
* Update mob_spawn.dm

* Update mob_spawn.dm

* Update mob_spawn.dm
2021-12-26 16:11:35 -05:00
Gandalf
23c1a5972c Ghost role alias code reset (#10289)
* E

* Update black_mesa.dm
2021-12-26 20:19:43 +00:00
Gandalf
276f752135 E 2021-12-23 03:38:10 +00:00
SkyratBot
b894ce42d4 [MIRROR] Super Mega Mob Spawn Refactor [MDB IGNORE] (#10075)
* Super Mega Mob Spawn Refactor

* Super Mega Mob Spawn Refactor

* Update modular changes

* update kilo

* i wish unit tests would work on my machine

* fix kilo...?

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-12-23 02:30:55 +00:00