Commit Graph

5227 Commits

Author SHA1 Message Date
SkyratBot
86d77fc6f5 [MIRROR] Fixes the door bolt button the starboard side of the default pirate shuttle [MDB IGNORE] (#9889)
* its starboard external not portstarboard external (#63235)

* Fixes the door bolt button the starboard side of the default pirate shuttle

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
2021-12-05 18:48:47 -05:00
SkyratBot
09431b3f05 [MIRROR] Deltaservice: Updates the cook's additional CQC areas [MDB IGNORE] (#9887)
* Deltaservice: Updates the cook's additional CQC areas (#63227)

* Deltaservice: Updates the cook's additional CQC areas

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-12-05 18:47:51 -05:00
Gandalf
f3020a7f42 Microfusion Energy Guns (#9638)
* RELOADING!

* Update skillchip.dm

* a

* Update master.dm

* Update master.dm

* Part one

* E

* E

* EOR

* Oops

* EEEH

* Fixes.

* begone oldcode from old times

* fixes

* cell attatchments

* haha u cant spell

* Gun attachments!

* Fastest gun in the west

* Update multi_cell_charger.dm

* ESA

* Stability

* phase emitters

* foixes

* More fixes

* Update microfusion_gun_attachments.dm

* Update microfusion_gun_attachments.dm

* eee

* Intermediate interactions.

* Update microfusion_energy_master.dm

* wooh

* EEE

* Update microfusion_cell.dm

* Map edits

* Merge branch 'master' into gun_reloads

* E

* attachment removal

* Update _basemap.dm

* proper parent gun interactions

* Update code/game/machinery/recharger.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* E

* Update modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Review comments pt2

* review comments pt2

* review part 3

* review part 4

* review 4.1

* review fixes

* Update microfusion_designs.dm

* ffs

* Update code/__DEFINES/~skyrat_defines/traits.dm

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

* Nearly there

* final review commit

* Update multi_cell_charger.dm

* Update microfusion_energy_master.dm

* E

* insight

* Fixes, rgb, remove instability on cells

* de epic

* Update _basemap.dm

* TGUI in the houise

* Update MicrofusionGunControl.js

* FULL STEAM AHEAD CHOO CHOO (Adds zooming)

* FUU bayonets and flights

* e

* Nearly

* microCHANGES

* Update gun.dm

* Minidate.

- Shooting the gun while it's overheating can cause it to [REDACTED].
- Shooting the gun while it's overheating will burn your hand!
- Some cells will now notify you when they're empty using an alarm sound.
- Gun barrel attachments now change the sound of the laser!
- An overheating emitter slows down!
- Emitters now control fire time more!

* 0

* owo

* FFF

* Update code/game/machinery/recharger.dm

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

* Update modular_skyrat/modules/gunhud/code/gun_hud_component.dm

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

* no spolsion

* Generally we want the cell in our hands

* 0

* Update microfusion_gun_attachments.dm

* E

* E

* FINAL

* superheater

* Update projectiles.dm

* Update microfusion_energy_master.dm

* Update projectiles.dm

* Update microfusion_gun40x32.dmi

* Update laser_1.ogg

* E

* whoop

* Cargo crates!

* Review plus material updates

* Update microfusion_designs.dm

* E

* E

* E

* E

* EEEE

* Update gun_spawns.dm

* Some fine tuining

* Update gun_spawns.dm

* Update recharger.dm

* E

* Update microfusion_gun_attachments.dm

* E

* E

* Update microfusion_gun_attachments.dmi

* Update code/game/machinery/recharger.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* E

* You can now actually insert different cells into advanced guns!

* 0

* E

* Update microfusion_gun_attachments.dm

* Update microfusion_energy_master.dm

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

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

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

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

* E

* Update microfusion_energy_master.dm

* Update microfusion_gun_attachments.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-12-03 22:38:08 +00:00
Tom
b4dc5309cd Adds a button to Blueshift crematorium (#9863) 2021-12-03 22:26:18 +00:00
Tom
bdef3b1f41 Blueshift engi tweaks (#9859)
* Blueshift engi tweaks

* superpacmans to pacmans
2021-12-03 22:26:12 +00:00
Tom
f67ded1ddc Removes direct character references from Blueshift (#9857) 2021-12-03 17:00:15 -05:00
SkyratBot
959f66bf47 [MIRROR] Fixed spelling of possession, Separate, and Cemetery [MDB IGNORE] (#9862)
* Fixed spelling of possession, separate, and cemetery (#63203)

Just fixes some spelling for gangs. I also fixed misspellings for "posession" to "possession". Fixed "seperate " to "Separate" Fixed "Cemetary" to "Cemetery"

* Fixed spelling of possession, Separate, and Cemetery

Co-authored-by: Doctor Pope <84367152+Dr-Pope@users.noreply.github.com>
2021-12-03 16:58:40 -05:00
SkyratBot
cd0a235b86 [MIRROR] METASTATION: Atmospherics Remap/Expansion (Project space, dedicated HFR chamber, crystallizer!) [MDB IGNORE] (#9841)
* METASTATION: Atmospherics Remap/Expansion (Project space, dedicated HFR chamber, crystallizer!) (#63007)

* METASTATION: Atmospherics Remap/Expansion (Project space, dedicated HFR chamber, crystallizer!)

Co-authored-by: PotatoMasher <33107541+Potato-Masher@users.noreply.github.com>
2021-12-03 11:07:59 +00:00
SkyratBot
84dd0b3ec2 [MIRROR] Deltaservice Fixes: Protolathe -> Techfab [MDB IGNORE] (#9822)
* lathe (#63193)

* Deltaservice Fixes: Protolathe -> Techfab

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-12-02 22:22:54 +00:00
SkyratBot
784677e4cb [MIRROR] Fix icebox's engine airlock having wrong access. [MDB IGNORE] (#9796)
* Fix icebox's engine airlock having wrong access. (#63153)

* Fix icebox's engine airlock having wrong access.

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-12-02 22:22:42 +00:00
Tom
659da51c92 Titan fix 2 (#9830) 2021-12-02 22:21:22 +00:00
SkyratBot
cd61215493 [MIRROR] Fixes some runtime errors [MDB IGNORE] (#9823)
* Removed two map-based runtimes for Syndicate Lavaland Base and The Derelict (#63177)

* Syndibase

* Derelict APC

* Fixes some runtime errors

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
2021-12-01 21:09:49 -05:00
OrionTheFox
73dff88937 [MANUAL MIRROR OF 9774 AND 9798] DELTASTATION: Complete service + arrivals revamp, cargo tweaks (some maintenance was harmed in the making of this pr) (#9779)
* DELTASTATION: Complete service + arrivals revamp, cargo tweaks (some maintenance was harmed in the making of this pr) (#62972)

* manually update our modular map mmm

* shuddle

* vacant office > NT rep office

now with lights

* '

* did i even make a change?

* ggggggg

* reinforced + spawn

* Manual mirror of #9798

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-12-01 07:43:53 +00:00
OrionTheFox
c3dbdcf7cf Kills the outdated aesthetics sub-module for Catwalks (#9768)
* DIE DIE DIE DIE DIE

* curses

* h

* hur durr
2021-11-29 13:45:44 -05:00
jjpark-kb
7d097ce509 splitting blueshift into multiple dmms as well as putting a readme in _maps (#9759)
* okay

* there
2021-11-28 19:50:18 -05:00
Tom
69ed8839c7 Blueshift balance pass (#9755) 2021-11-28 15:08:28 -05:00
SkyratBot
5509d3b47c [MIRROR] Bot code improvement (2/??) [MDB IGNORE] (#9717)
* Bot code improvement (2/??)

* Feex

* More feex

* Now we're good... Right?

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-28 01:55:51 +00:00
SkyratBot
aefaa7e228 [MIRROR] Re-paths and changes the worn layer of GAR glasses [MDB IGNORE] (#9736)
* Re-paths and changes the layer of GAR glasses (#63009)

Re-paths GAR glasses to make them subtypes of each other, where applicable.
Re-names some of the icon states, to make it clearer as to what they are.

Changes the alternate_worn_layer to make them show over hair, rather than under. (Muh reference)

Subtypes good. Being able to see what you're wearing properly also good.

* Re-paths and changes the worn layer of GAR glasses

* Feex

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-28 01:10:36 +00:00
SkyratBot
6e13367e78 [MIRROR] Abductor Frankenstein edition: How aliens got a limb grower. [MDB IGNORE] (#9731)
* Abductor Frankenstein edition: How aliens got a limb grower. (#62841)

This PR will completely remove the brain traumas component of being abducted. in its place, there will be a round start limb grower machine to make up for it. All upgrade disks for the machine come in the above locker and I was even nice enough to include 50 units of synthflesh! Wow!

* Abductor Frankenstein edition: How aliens got a limb grower.

* Fixed Skyrat's abductor ships

Co-authored-by: carshalash <carshalash@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-27 17:10:31 -05:00
IsaacTheSharkWolf
d6b35d56bb Blueshift update, fixes and improvements. (#9694)
* Update BlueShift.dmm

* Update BlueShift.dmm

* Update BlueShift.dmm

* Update BlueShift.dmm
2021-11-26 22:56:43 -05:00
Tom
056b652ebc Barber fix (#9613) 2021-11-26 16:56:00 -05:00
SkyratBot
3420c40ec5 [MIRROR] Upgrades the Fission360 app to be more on par to the old pinpointer [MDB IGNORE] (#9727)
* Upgrades the Fission360 app to be more on par to the old pinpointer (#63045)

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

* Upgrades the Fission360 app to be more on par to the old pinpointer

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-11-26 15:36:55 -05:00
Useroth
7b15abf19a and missed one (#9696) 2021-11-25 11:42:55 +01:00
SkyratBot
f00b0cf12e [MIRROR] [MDB IGNORE] Repath wall reagent dispensers [MDB IGNORE] (#9587)
* [MDB IGNORE] Repath wall reagent dispensers (#62593)

* Repath wall reagent dispensers

This changes /obj/structure/reagent_dispensers/{virusfood,peppertank}
to be subpaths of /obj/structure/reagent_dispensers/wall.

The WALLITEMS test now checks for all wall mounted reagent dispensers,
instead of just peppertank specifically.

> git ls-files '*.dmm' | xargs -d\\n sed -i 's@ /obj/structure/reagent_dispensers/peppertank@ /obj/structure/reagent_dispensers/wall/peppertank@ g'
> git ls-files '*.dmm' | xargs -d\\n sed -i 's@ /obj/structure/reagent_dispensers/virusfood@ /obj/structure/reagent_dispensers/wall/virusfood@ g'

* [MDB IGNORE] Repath wall reagent dispensers

* Fixing our maps for this

* Fixing our map, bis

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

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

Co-authored-by: esainane <esainane+github@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-23 16:07:21 -05:00
SkyratBot
81199f2146 [MIRROR] Add randomized tracking beacons to all maps [MDB IGNORE] (#9537)
* Add randomized tracking beacons to all maps (#61673)

This takes the new random tracking beacon spawner and adds them to all maps. The only guaranteed tracking beacon that spawns is the one at arrivals. The rest have a 35% chance to spawn and are located in the following areas:

    teleporter
    AI Sat teleporter
    escape
    showcase
    bridge
    courtroom
    bomb testing range
    atmos
    xenobio secure chamber
    medbay
    engineering
    bar/cafe
    EVA
    virology
    dorms
    mech bay
    lavaland
    cargo
    shooting range/security
    chapel
    disposals
    hydro
    garden
    library
    gateway
    incinerator room
    vacant office

More roguelike randomization for every round is good for the soul.

* Add randomized tracking beacons to all maps

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-23 14:09:00 -05:00
Tom
2cf65ef102 Ballgag refactor and conversion to GAGS (#9594)
* ballgag refactor

* remove sound files + CI fix

* icon states

* return of the sizes
2021-11-23 13:53:54 -05:00
SkyratBot
d3692922ef [MIRROR] Donuts found in sec vendors and boxes can now be used to make glazed donuts [MDB IGNORE] (#9559)
* Donuts found in sec vendors and boxes can now be used to make glazed donuts (#62910)

* Donuts found in sec vendors and boxes can now be used to make glazed donuts

* Hopefully fixes CI

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-23 12:02:47 -05:00
SkyratBot
d0a9c24bbd [MIRROR] A step up: The Lawyer Suit Resprite! [MDB IGNORE] (#9642)
* A step up: The Lawyer Suit Resprite! (#62961)

Co-authored-by: Changelogs <action@ github.com>

* A step up: The Lawyer Suit Resprite!

Co-authored-by: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
Co-authored-by: Changelogs <action@ github.com>
2021-11-23 09:53:08 -05:00
Tom
be8865ba4b Refactors "chemistry" (#9532)
* Refactors "chemistry"

* Review + map checks

* More vars

* missed calls to parent

* Requested changes

* final comment tidy up

* Update modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/chemistry_for_ERP.dm

* Update modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/chemistry_for_ERP.dm

* another var

* Shift vars around & remove vars on humans

* final (?) var shuffling

* oops
2021-11-22 16:19:28 -05:00
Tom
b56e9114c4 Removes obsolete captain outfit (#9616)
* Female parade outfit fix

* removes item
2021-11-22 20:03:00 +00:00
Tom
6a4537fa4e de-capitalises a few paths (#9618) 2021-11-22 20:02:25 +00:00
SkyratBot
5681c464f2 [MIRROR] Adds Supply Request Consoles to Cargo [MDB IGNORE] (#9608)
* Adds Supply Request Consoles to Cargo (#62860)

* Adds Supply Request Consoles to Cargo

Co-authored-by: BlueMemesauce <47338680+BlueMemesauce@users.noreply.github.com>
2021-11-22 11:20:14 -05:00
SkyratBot
4145f915e4 [MIRROR] Fixes Icebox Ordnance Air Alarm [MDB IGNORE] (#9586)
* Fixed Icebox Air Alarm (#62927)

* Fixes Icebox Ordnance Air Alarm

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-11-21 18:42:32 +00:00
SkyratBot
1e563735f2 [MIRROR] Revamps the Space Hotel Ruin [MDB IGNORE] (#9585)
* Revamps the Space Hotel Ruin (#62659)

* Revamps the Space Hotel Ruin

Co-authored-by: Zytolg <33048583+Zytolg@users.noreply.github.com>
2021-11-21 18:32:55 +00:00
IsaacTheSharkWolf
8f6228a974 Blueshift touch ups and fixes (#9597)
* Update BlueShift.dmm

* Update BlueShift.dmm
2021-11-21 16:54:12 +00:00
IsaacTheSharkWolf
da27825491 Blueshift map edits and fixes. (#9571)
* Update BlueShift.dmm

* Update BlueShift.dmm
2021-11-19 17:39:40 -05:00
SkyratBot
2dc31b1a58 [MIRROR] Fixes unpowered icebox mining doors [MDB IGNORE] (#9561)
* Fixes unpowered icebox mining doors (#62847)

* Fixes unpowered icebox mining doors

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-11-19 20:37:19 +00:00
SkyratBot
c18a9ee882 [MIRROR] Add cosmetic random spawners to Metastation [MDB IGNORE] (#9553)
* Add cosmetic random spawners to Metastation (#62929)

* Add cosmetic random spawners to Meta

* Add cosmetic random spawners to Metastation

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-11-19 20:36:57 +00:00
Tom
5efee7ccc1 Icebox hotfix (#9545) 2021-11-18 18:47:58 -05:00
GoldenAlpharex
60eb5faad9 Improved the barber's chair's appearance and improves the barber item code overall (#9474)
* Improved the barber code and the appearance of the barber chair

* Better improvements to how the armrest stuff is handled
2021-11-18 15:01:58 +00:00
SkyratBot
054b4d9739 [MIRROR] nitryl and stimulum merge in nitrium [MDB IGNORE] (#9514)
* nitryl and stimulum merge in nitrium (#62061)

This PR is the first of a few were i'll be merging similar working gases into one.
This time is Nitryl and Stimulum. They'll be merged into Nitrium , a brown gas with both features of the two gases
The main scope is to add dept to atmos by removing bloated content and/or repeated content that has never seen the lights of the day (how many times have you seen both gases made and used at the same time?)
The PR so far:
-removed nitryl
-removed stimulum
-merged them into Nitrium (Nitrium is now made with trit, nitrogen and bz from a minimum temperature of 1500 K)
-made Nitrium have both gases features such as fast movements and sleep and stun immunity but increased damage taken
-Nitrium can make crystals that spread the chemicals with a cloud (is still far more efficient to just breathe the gas)

Less rare gases, going towards a better atmos gameplay loop

* nitryl and stimulum merge in nitrium

* Fixing blackmesa

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-17 15:14:33 -05:00
Tom
3f7aecc1da Adds cryo to most places it's missing (#9515)
* Adds cryo to interlink & icebox

* add to perma

* and cafe
2021-11-17 17:33:26 +00:00
ORCACommander
db58ce1f96 Iced Syntax Error (#9508) 2021-11-17 02:53:10 +00:00
Tom
233b2859d4 Departmental order consoles (#9500) 2021-11-16 23:55:16 +00:00
Iajret
a1d0782de4 Fixes to SM gas filters. (#9178)
* Fixes to SM gas filters, tesla coils and grounding rods

All of the skyrat map had old filter settings to filter nitrogen and that caused some "small" problems. Also Delta and IceBox have correct object type for rods and coils.

* forgot about blueshift
2021-11-16 23:43:19 +00:00
SkyratBot
8e3d1881c3 [MIRROR] Manually correct dir on every special airalarm [MDB IGNORE] (#9483)
* Manually correct dir on every special airalarm (#62790)

* Manually correct dir on every special airalarm

Also fix the placement of the box mixing air alarm.

* Forgot to check in MetaStation

* Manually correct dir on every special airalarm

Co-authored-by: esainane <esainane+github@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-16 15:54:10 -05:00
Gandalf
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
Gandalf
9298f04a70 Modularised Cryopods (#9456)
* E

* E

* We don't need the area lol.
2021-11-15 16:57:12 -05:00
GoldenAlpharex
0cc86c80d2 Ensuring all of our maps will get compiled by the Compile Maps action (#9374) 2021-11-15 19:16:40 +00:00
Gandalf
50e7995249 Whew. 2021-11-14 23:15:14 +00:00