Commit Graph

3513 Commits

Author SHA1 Message Date
Azarak
9f39a0cdf0 Update CentCom_skyrat_z2.dmm (#3820) 2021-03-04 01:00:26 +00:00
Gandalf
c13badc770 Old to New ID system compliance (#3807)
* a

* Update modular_skyrat/modules/icspawning/code/game/objects/items/cards_ids.dm
2021-03-03 18:35:48 +00:00
Tom
020b5f14c8 captain case access (#3805) 2021-03-03 17:43:19 +00:00
Tom
0192b42a14 [SPEEDMERGE FOR NOOBS AND CAPTAINS] Adds memo for new ID system to HoP offices + Cap's spare safe (#3803)
* adds ID memo to HoP office

* Adds cap spare safe heehee
2021-03-03 16:32:07 +00:00
Cheshify
5933ffd812 [MODULAR] Delta Med Changes (#3381)
* Delta Med Changes

* Fixed Windoors
2021-03-03 05:19:47 +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
Sza'Thi
78019da7f4 Adds Bumbles to the botany department, carefully. (#3752) 2021-03-02 21:21:21 +00:00
SkyratBot
c9ea7b092f [MIRROR] Removes Several Duplicate Items From MetaStation (#3744)
* removes several duplicate items from MetaStation (#57288)

* Removes Several Duplicate Items From MetaStation

Co-authored-by: Paxilmaniac <57122098+Paxilmaniac@users.noreply.github.com>
2021-03-01 23:48:37 +00:00
Tom
df4514b428 Ghost Cafe plumbing area + small fixes (#3738)
* cafe fixes + plumbing

* jukebox access
2021-03-01 17:57:54 +00:00
KathrinBailey
2eab6701be erm uhm eerrr (ai sat had a literal stroke) (#3725)
* toolspeed increases to 0.5 from 0.7 for power tools

also increases syndie jaws speed for obvious reasons

* map bug w/ ai sat

urrrhh it's a little stroke-y.
2021-02-28 23:24:32 +00:00
SkyratBot
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
NotRanged
f44350ab5b [Semi-Modular] Ghost Cafe (#3592)
* wip

* more progress

* weh

* Fixes spawners

* Adds missing objects, mass replaces in the .dmm

* WIP

* Screm

* map compile error

* Bugfixes

* ID

* no mechs

* Linter, indestructible pool, typo

* why

* Fixes issue maybe

* deletes jukebox

* Removed combat area on request

Co-authored-by: Ranged <nickvanderkroon@gmail.com>
2021-02-28 14:07:31 +00:00
KathrinBailey
d06d742d50 Updates modular maps with TG's recent changes. (#3695)
* 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
2021-02-27 11:26:28 +00:00
KathrinBailey
a5e368b373 Hard syncs all TG maps (#3694)
please don't fail git actions
2021-02-27 10:17:17 +00:00
SkyratBot
4770eca75e [MIRROR] Adds tourist robots that order food and drinks from the bar and cafeteria (#3651)
* Adds tourist robots that order food and drinks from the bar and cafeteria (#57010)

* Adds Tourism Economy

Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds tourist robots that order food and drinks from the bar and cafeteria

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-27 09:19:00 +00:00
Cheshify
ae3fa66368 [MODULAR] Metastation Prison Rework (#3620)
* First Draft

* Update to Decals

* Requested Changes Made
2021-02-27 08:50:09 +00:00
BluBerry016
46467beacd [Modular] ShipStation Toxins. (#3659)
* Update ShipStation.dmm

* Update ShipStation.dmm

* cable
2021-02-26 14:22:12 +00:00
SkyratBot
e5ff997ef8 [MIRROR] Experi-Sci: Techweb nodes may now require you to perform "scientific" experiments (#3614)
* Experi-Sci: Techweb nodes may now require you to perform "scientific" experiments

* Update all_nodes.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-23 21:51:28 +00:00
BluBerry016
31c1d4ebdd [Modular] More.. More. More.. More. More. DS-1 Tweaks. (#3597)
* Create machine_bluespaceminer.dm

* Revert "Create machine_bluespaceminer.dm"

This reverts commit 553dfd47795d0faa9167d42175109ba81d83d176.

* Update CentCom_skyrat_z2.dmm

* Revert "Revert "Create machine_bluespaceminer.dm""

This reverts commit 05de6cd002eb1c3e9cf117166953a6fa92249bb1.

* aaaaaaaaaaaaaaaaaaAAAAAAAA

* Revert "aaaaaaaaaaaaaaaaaaAAAAAAAA"

This reverts commit d357f77d89be79f478b425ff49b4c4d6c155292a.

* Revert "Revert "Revert "Create machine_bluespaceminer.dm"""

This reverts commit 4496d23426549824b44641650cff995d1b56574c.

* Update CentCom_skyrat_z2.dmm
2021-02-22 23:41:49 +00:00
SkyratBot
fc2fc8db6b [MIRROR] Icebox QoL minus features (#3459)
* Icebox QoL minus features (#56472)

* Icebox QoL minus features

Co-authored-by: Whoneedspacee <yougotreallyowned@gmail.com>
2021-02-21 22:02:33 +00:00
BluBerry016
cb990365de genetics (#3555) 2021-02-21 14:25:32 +00:00
BluBerry016
354472c56a Fixes virology monkey pens atmos diffs (#3544) 2021-02-20 23:13:52 +00:00
SkyratBot
c31d1334b2 [MIRROR] Adds a blob-start landmark to runtime station to avoid crashes (#3545)
* Adds a blob-start landmark to runtime station to avoid crashes (#57053)

* Adds a blob-start landmark to runtime station to avoid crashes

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
2021-02-20 21:54:51 +00:00
BluBerry016
5156532139 [Modular] I can't beleive it's even more DS-1 Tweaks! (#3417)
* Exterior window feex

* Seperates areas, fixes exterior windows

* Whoops forgot the CRO

* meeediccc

* Update CentCom_skyrat_z2.dmm

* planetary atmos

* merges map down temp

* Update CentCom_skyrat_z2.dmm

* Gives the CEO APC Access

* fridge fix

* consistency
2021-02-19 23:16:17 +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
KathrinBailey
4ed13bc3f7 Icebox Prison: the Glass Agenda (#3485)
* colourful and dark floors!

* Update floors.dmi

* Update floors.dm

* Update floors.dm

* Update floors.dmi

* Update floors.dm

* all the damn heckin' maps

* Update MetaStation_skyrat.dmm

* Update IceBoxStation_skyrat.dmm

* Prisoner Latejoin spawners

Also a ton more prisoner slots in general! And cyborg spawns. Let's not have 12 people ready as prisoner and then the game not finding enough spawns.

* Merge branch 'master' into paws-on-the-floor

* github won't let me change branches

unless I merge this

* It's finally over...

Icebox prison is done.

* New Icebox hut!

* FLOWERS!!

* multiple minor bugfixes

* a light

* area nitpick fix

* gives spacehut all access air alarm

* adds reinforced windows

shouldn't be too easy to break out now should it?
2021-02-18 19:21:25 +00:00
DuffCreeper
745a8813aa Edits Deltastation SM to be less... wack (#3313)
* AAAAAAA

* i forgotti to add updated changes

ex de
2021-02-18 13:37:23 +00:00
SkyratBot
48cb3a1720 [MIRROR] Cleans up some shoddy atmos piping in engineering and holodeck on Meta (#3368)
* Cleans up some shoddy atmos piping in engineering and holodeck on Meta (#56618)

* Cleans up some shoddy atmos piping in engineering and holodeck on Meta

* Map Diff bot stop being broken.

* missing pipe is now no longer missing

* Cleans up some shoddy atmos piping in engineering and holodeck on Meta

Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
2021-02-18 13:04:47 +00:00
KathrinBailey
c85af26f3d Icebox & Metastation Bugfixing & New Prison (#3434)
* colourful and dark floors!

* Update floors.dmi

* Update floors.dm

* Update floors.dm

* Update floors.dmi

* Update floors.dm

* all the damn heckin' maps

* Update MetaStation_skyrat.dmm

* Update IceBoxStation_skyrat.dmm

* Prisoner Latejoin spawners

Also a ton more prisoner slots in general! And cyborg spawns. Let's not have 12 people ready as prisoner and then the game not finding enough spawns.

* Merge branch 'master' into paws-on-the-floor

* github won't let me change branches

unless I merge this

* It's finally over...

Icebox prison is done.
2021-02-16 17:15:04 +00:00
SkyratBot
4fafda3d26 [MIRROR] ICEBOX: Snow plates outside, wiring and camera fixes (#3367)
* ICEBOX: Snow plates outside, wiring and camera fixes (#56679)

* Snow plates outside, wiring and camera fixes v2

* waster injector in atmos

* ICEBOX: Snow plates outside, wiring and camera fixes

* Update IcemoonUnderground_Above_skyrat.dmm

Co-authored-by: NightRed <nightred@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-16 12:55:21 +00:00
SkyratBot
18f7ed58eb [MIRROR] Removes older ID consoles from the code, and circuitboards (#3284)
* Removes older ID consoles from the code, and circuitboards

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

* a

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-16 12:44:12 +00:00
BluBerry016
9547140f4a [Modular] Yet even MORE DS-1 Tweaks. (#3316)
* fucking nice

* BEEG update

* pog

* feex

* Update assaultops_spawners.dm

* feex

* Revert "feex"

This reverts commit 7bd795b78676995dfe929a0a085a43fce62f7a88.

* feex

* Update CentCom_skyrat_z2.dmm

* aaaa

* some lights

* Update CentCom_skyrat_z2.dmm

* small pet feex

* [TEMP?] removes easter egg

* [TEMP?] Tweaks Prison to remove some mapedit vars

* Update CentCom_skyrat_z2.dmm

* Revert "[TEMP?] Tweaks Prison to remove some mapedit vars"

This reverts commit 319e0939a989f93f519ef3bd8dc4100a8db645f6.

* Revert "Update CentCom_skyrat_z2.dmm"

This reverts commit b55d4a91ac9ddcd382d21aa380402c716d78d080.

* Revert "[TEMP?] removes easter egg"

This reverts commit c3315d5d3bfac93e39c8e8d49f491579dd061867.

* changes water/overlay to just water

* forgot one pool

* Update CentCom_skyrat_z2.dmm
2021-02-15 20:14:21 +00:00
SkyratBot
0cf8d6a649 [MIRROR] Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#3403)
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754)

* Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.

* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols

* Update maint_loot_common.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 17:48:59 +00:00
SkyratBot
5e033f0da8 [MIRROR] Kilo atmospheric devices fix (#3400)
* Kilo atmospheric devices fix (#56880)

## About The Pull Request
Fixes some minor issues involving a few atmospheric machines on KiloStation.
An air alarm that is floating in the air has had its pixel Y value changed.
All maint gas flow meters have been moved to layer four or two so they are actually functional now.
I've added additional gas flow meters nearby to two layer 4 meters so there is monitoring for most the distribution and scrubbing networks in areas where there was originally only one gas flow meter.

## Why It's Good For The Game
For the air alarm and re-layered gas flow meters these are map issues and fixing issues is always good for the game.
For the 2 additional gas flow meters I made these based on the fact that Kilo had two gas flow in medbay maint, one of which I set to layer 2. For consistency I've added an additional meter to all maint gas flow meters on the scrubbing network, the maintenance atmospheric connectors are excluded.

* Kilo atmospheric devices fix

Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
2021-02-15 15:33:20 +00:00
SkyratBot
71a1936ecf [MIRROR] Fixes free buffers in reaction chambers (sorry!) (#3382)
* Fixes free buffers in reaction chambers (sorry!) (#56887)

* Fixes free buffers in reaction chambers (sorry!)

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-02-15 15:19:51 +00:00
SkyratBot
0cf507c273 [MIRROR] Fixes Icebox backstage from service hall access inconsistency. (#3405)
* Fixes Icebox backstage from service hall access inconsistency. (#56772)

Co-authored-by: Cosmo <cosmo.rader@ yandex.com>

* Fixes Icebox backstage from service hall access inconsistency.

Co-authored-by: Potato-Masher <33107541+Potato-Masher@users.noreply.github.com>
Co-authored-by: Cosmo <cosmo.rader@ yandex.com>
2021-02-15 15:06:28 +00:00
BluBerry016
9ea9c000fd [Modular] Shipstation Fix. (#3371)
* floor fix

* Update station_ship.dmm

* feex.

* Update maps.txt

* Revert "Update maps.txt"

This reverts commit e57e0a095fe5a6534f99aa8ab941cbbbd4d9c84c.
2021-02-14 01:11:19 +00:00
Tom
e648c4d4b7 oh no missing wire (#3366)
* oh no missing wire

* also fixes missing area
2021-02-13 23:32:04 +00:00
SkyratBot
c430e11d0b [MIRROR] Fixes tags on ordered pizza (#3344)
* Fixes tags on ordered pizza (#56369)

Box tags

    Fixes bug where box tags weren't updating correctly on creation
    Adds box tag flavours for the pizzas without them (i.e. Donk Pocket -> Bangin' Donk, Dank -> Fresh Herb, Sassysage -> Sausage Lovers, Arnold -> 9mm Pepperoni)

Randomised pizza crates

    Pizza crates can now come with any five pizzas, weighted by disruptiveness
    Small chance of getting one pizza bomb in a pizza crate (either armed or not) per shift

Armed pizza bomb

    Adds an armed variant of the bomb pizza box, which has the boxtag "Meat Explosion", contains a meat pizza and explodes 5 seconds after opening
    Makes the pizza party spawner use the armed bomb pizza box, instead of giving whoever a free syndicate pizza bomb they probably aren't allowed to use anyway

Secure kitchen crate

    Adds the secure kitchen crate from my previous PR
    Adds a secure pizza crate variant to KiloStation's cargo warehouse where the freezer crate was, which contains the pizza party and is locked with kitchen access

Ghost examines

    Adds ghost examine messages for pizza boxes with bombs or the nanomachine pizza in them

* Fixes tags on ordered pizza

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-13 10:13:43 +00:00
BluBerry016
c3570d7168 [Semi-Modular] Adds Shipstation, an entire station... on a shuttle. (#2680)
* Adds Shipstation

* Whoops, haven't ported the turnstile module in yet

* Update maps.txt

* SHIPSTATION OVERHAUL BABYYYY

Updates shipstation to (most) of Kath's suggestions, adds a dedicated shuttle pilot job and completely overhauls the map itself.

* Shuttle Pilot  Landmark

* Air Supply

* Scrubber Pipes

* Scrubber Pipes 2

* Digi Fix

* card.dmi fix

* Update tgstation.dme

* a

* Update tgstation.dme

* card.dmi

* HOP Office Beutification

Sec next

* sec overhaul compliance

* Update station_ship.dmm

* area / iron repath

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-12 14:34:26 +00:00
BluBerry016
6ebf8c673a AAAAA (#3318) 2021-02-12 14:27:39 +00:00
BluBerry016
6639901ae0 [Modular] Yet More DS-1 Tweaks (#3273)
* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm
2021-02-12 00:14:13 +00:00
KathrinBailey
bc22bc5abe Rebases Metastation & Updates Modular Maps (#3233)
* colourful and dark floors!

* Update floors.dmi

* Update floors.dm

* Update floors.dm

* Update floors.dmi

* Update floors.dm

* all the damn heckin' maps

* Update MetaStation_skyrat.dmm

* Update IceBoxStation_skyrat.dmm

* Prisoner Latejoin spawners

Also a ton more prisoner slots in general! And cyborg spawns. Let's not have 12 people ready as prisoner and then the game not finding enough spawns.
2021-02-09 16:35:46 +00:00
Gandalf
3cfd853bf3 MAJOR: Non-modular map hardset 09.02.2021 (#3219)
* Major map forcedate 09.02.21

* a
2021-02-09 00:50:46 +00:00
SkyratBot
aa22eaee89 Replaced all id consoles with modular ones (#3212)
Co-authored-by: Fhaxaris <Chrisamcculler@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:55:36 +00:00
SkyratBot
5e64cae718 Replaces Mules with a Cargo Hauler and Rollerskates on Meta (#3202)
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:51:07 +00:00
SkyratBot
74dec5f344 [MIRROR] Change nanite lab access from Xenobio to Research on Metastation (#3196)
* Nanite lab access from Xenobio to Research (#56594)

* Change nanite lab access from Xenobio to Research on Metastation

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-02-08 23:44:20 +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
1f511621c8 The beer nuke is now on KiloStation (#3150)
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:10:16 +00:00