Commit Graph
7 Commits
Author SHA1 Message Date
WaterpigandGitHub ea02989f38 [SKYRAT CLEANUP] Removes / updates all bubber comments in the skyrat modular file as we are no longer their subject (#2330)
## About The Pull Request

"I'm going to extend my break" - Me, 2 days ago

"Hey I should start cleaning up the Skyrat modular folder" - Me, Today

I yet again fall victim to my own hubris

Left out some BUBBER TODOs, feel free to do these if you find them
manageable

## Why It's Good For The Game

We made some old mistakes with some edits (Like commenting out ruins
instead of making them unpickable for the ruin system) (This I fixed,
admins can now bus them in!)

We also made a lot of edits to Skyrat code, a lot of which can be
cleanly merged into their code now

## Proof Of Testing

If it compiles, it works.

Unlike my modularization PR from a year ago this is less fuckupable

## Changelog

N/A, not player facing
2024-11-16 14:20:10 +00:00
nevimer 45e52eb774 Merge remote-tracking branch 'skrat/master' into new-bubbermaster
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
#	_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
#	_maps/map_files/Birdshot/birdshot.dmm
#	_maps/map_files/Deltastation/DeltaStation2.dmm
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/map_files/MetaStation/MetaStation.dmm
#	_maps/map_files/NorthStar/north_star.dmm
#	_maps/map_files/VoidRaptor/VoidRaptor.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	_maps/shuttles/pirate_ex_interdyne.dmm
#	code/__DEFINES/mobs.dm
#	code/__HELPERS/~skyrat_helpers/is_helpers.dm
#	code/datums/mood.dm
#	code/game/objects/effects/spawners/random/random.dm
#	code/modules/admin/verbs/adminhelp.dm
#	code/modules/clothing/head/jobs.dm
#	code/modules/mob/living/brain/brain_say.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png
#	code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png
#	code/modules/uplink/uplink_items/job.dm
#	config/lavaruinblacklist.txt
#	icons/mob/actions/actions_changeling.dmi
#	icons/mob/clothing/mask.dmi
#	icons/obj/mining.dmi
#	modular_skyrat/master_files/code/modules/client/preferences/headshot.dm
#	modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm
#	modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
#	modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi
#	modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi
#	modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/metal_overlays.dmi
#	modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm
#	modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
#	modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
#	strings/traumas.json
#	tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/headshot.tsx
2024-04-20 22:19:03 -04:00
53d1f4ada0 [MIRROR] Universalizing ruin names (#26750)
* Universalizing ruin names

* Update code/datums/ruins/space.dm

* Update space.dm

* a

* Update lavaland.dm

---------

Co-authored-by: Zergspower <Griffinj88@yahoo.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2024-03-22 11:46:14 -04:00
StrangeWeirdKittenandGitHub c921164b79 (Mostly-Modular) SSV Dauntless - Interdyne Rework (#520)
#481 Yeah I fucked up and my original PR closed.


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/4a42bb01-0558-4c92-8bb8-afb28e282c39)

## About The Pull Request

Replaces Interdyne only on Lavaland with an entirely new syndicate
outpost. It combines what made DS-2 so beloved with Interdyne.

## Why It's Good For The Game

Interdyne is old. It's lived out a good life, and when DS-2 was
remapped, people shifted more towards playing on DS-2. Sadly it was
removed, but I've spent the time to completely map an entirely new ship
that combines both DS-2 and Interdyne. It still takes up relatively the
same footprint. Now, everything is focused internally, with two
bluespace miners that have to be set up, and a prisoner spawner. All and
all, let's try something new and Bubber flavored.

**Edit:** Cybersun is an incredibly shallow ghost role and it only
breeds boredom, which then is sated in two ways:

- Space tide with syndi gear and the syndicate faction tag
- Screw with the station

Neither really is the goal for this server and this is being edited
after discussion with both Cheeto and Ozzo after apparently ruin
blacklist doesn't work on the config.

## Testing / Tour
Raw video. Buttons do work.

https://youtu.be/BHbOIwpqQqY

## Changelog

🆑 Danger Kitten
add: Lavaland has more Syndicate presence. SSV Dauntless has landed.
remove: Cybersun no longer spawns.
/🆑

<!-- 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. -->
2023-09-24 12:41:53 -04:00
6c33d8f614 CI Fixes (#19756)
* Delete humanform.dm

* bad NANA!!!

* Update simple_animal_freeze.dm

* Update changeling.dm

* e

* wew

* Fixes the issue that caused CI to fail compilation

* Forgot to remove this one.

* wew

* fix screenshot unit test

* fixes emissive CI

* color cutoffs

* more emissive fix

* Update wardrobes.dm

* tallboy

* fix

* regen screenshots

* Update dna.dm

* screenshots

* Update dna.dm

* Fixes the lesserform unit test

* Adds our own monkey screenshots because we have monkey jumpsuits :)

---------

Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2023-03-10 19:01:40 -05:00
GandalfandGitHub 5aaa0979d2 [MDB IGNORE] Brings map files upto standard (#10228)
* E

* E

* E

* E

* e

* E

* spawners

* E

* E

* e

* Update space.dm

* Update scrapheap.dmm

* E

* E

* Update vaulttango.dmm
2021-12-24 17:43:07 +00:00
GandalfandGitHub 4a950241b6 [PRIORITY] MODULARISATION AUDIT PART 1: MAKING SKYRAT GREAT AGAIN (#9464)
* EFT

* E

* EEE

* E

* INTO TO ORBIT

* I hate this but I'm going to ignore it.

* Seriously, fuck this.

* Update CentCom_skyrat_z2.dmm

* Update tgstation.dme

* oops

* Update positronic_alert_console.dm

* E
2021-11-16 12:01:30 -05:00