Commit Graph

452 Commits

Author SHA1 Message Date
Redmoogle 3be5ca8676 Charlie Station Redesign/Rework (#45838)
* Charlie Rework

* Charlie Rework Extra Fluff

* .slap MapDiffBot

* Stop being stupid MapDiff Bot

* you too travis

* Adds a extra set of o2 tanks, adds some more rust, and fixes 2 solar panels already being prebuilt

* Adds a few more meteors and general fixes

* Mining Area for Charlie/Beta Added

* Charlie Station Mining Area

* General fixes

* Beta Hallway is longer also puts stuff into more proper places

* Fixes a 1 tile fuckup

* Fixes bad wall placement and also hallway doors

* Removes out-of-place plants oops

* Adds extra areas for charlie

* Changes the threat

* Removes gas miner and general fixes
2019-08-17 23:47:18 -07:00
Dawson1917 39d65102af Removes GPSes from Deep Storage and the Caravan Ambush 2019-08-14 10:42:57 +09:30
Rob Bailey 3f36f14ba4 Merge pull request #45587 from nemvar/3seashells
Adds three seashells to charlie station.
2019-07-31 02:44:59 -07:00
Rob Bailey 6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
nemvar c9038d404d Adds the three seashells. 2019-07-29 18:17:04 +02:00
Garen Crownguard e851b6550a Cult hoods can be toggled (#45497)
* Cult hoods can be toggled

* oops
2019-07-28 05:00:50 -07:00
Deepspacenoises d16a0803f3 fixes my fuckup round 2 (#45486) 2019-07-27 20:18:48 -07:00
Rob Bailey bfb6cf01bb Refactors shield wall generators (#45221)
* migrates the shield generator to the powered typepath

* map update

* fixes wire unsecuring weirdness

* this should go here actually

* minor reformatting + documentation
2019-07-19 08:05:57 +02:00
Deepspacenoises cd59c8e4b7 Lavaland Syndicate Base fusion (#45234)
* henk

* Syndicatelavalandupdates

* Added some rad collectors and moved some stuff
2019-07-18 20:38:15 -07:00
nemvar a3a5cf647c Replaces the slime extract in the clown biodome with a superlube sprayer. (#45134) 2019-07-15 10:10:38 -04:00
nemvar 572be7ec6a Bye bye animal hospital. (#45070)
* byebyeanimalsurgeons

* here we go

* config

* removesbeach

* a bit more compact

* updates some vars

* fixes walls getting destroyed by other generation stuff
2019-07-12 09:47:05 -04:00
actioninja 169a974b6c map vars cleanup 2019-07-09 21:29:08 -07:00
nemvar a6c0939a8c Add seashells to beach zones (#44988)
It's a harmless decorative item. People can use it in their mapping
and whatnot.
2019-07-05 15:11:29 -07:00
Emmett Gaines 48f19baba1 Randomizes lavaland atmos (#44427)
This makes lavaland atmos random per round. You won't get eternally burning hell worlds or vacuums but it's nice for a bit of variety.

Admins can edit the gas mixture for all of lavaland at once if they want to ruin some miners' day.

image

cl
add: Lavaland atmos is no longer a preset gas mixture and varies per round
tweak: Bonfire minimum oxygen content has been reduced
/cl
2019-06-29 21:07:26 +12:00
Rob Bailey 65e9888fa6 [READY] Smart Cables (#44265)
Cables now autoconnect on cardinal directions. All cable placement has been completely stripped out and replaced with simple single cable per tile logic.
Low effort demo: https://www.youtube.com/watch?v=fXp8s6ORWbA
Yes I am aware that cutting it is not dropping wire, that version was bugged.
Cables no longer need a knot specifically placed to link to power objects. The sprite is automatically changed to represent this.
The only exception to this logic is that on smes units, due to the terminal being next to the output, they will not link there.
On a technical powernet side, this is the same as old cables once actually placed. They still use the existing powernet system, just the placement and connection works differently.

Old cables have been turned into "pipe cleaners" for wire art purposes. they work just like the old ones, just missing all the powernet functionality, and also you can put them on top of the floor.
Why It's Good For The Game

How obnoxious cables were to both map and work with in game has been something that has annoyed me for a really long time now.
This is both easier for new players to learn, and easier for experienced players to work with.
Along with making in game much more intuitive and easier, it makes mapping much easier as well. Mad lad wjohn was able to rip out all the mapping conversion in one day because of how much faster it is to work with.

cl actioninja and wjohn
add: Cables have been completely reworked. Simple per tile connection logic, automatically connects to things above it. Think minecraft redstone.
add: Old cables have been kept as pipe cleaner. They are non-functional in terms of power, but otherwise have the same connection logic. Also can go on top of tiles.
remove: mech cable layer has been removed because it was terrible shitcode nobody used
tweak: (sort of balance) cable stack sized has been reduced to 15.
/cl
2019-06-22 10:24:37 +12:00
nemvar 6eaf40adb1 Makes the hermit more based. (#44564)
* welp

* h

* Let's hope I didn't mess map diff up.

* prisoner unbased
2019-06-18 23:24:09 -04:00
nemvar d2cd28da78 Adds superlube to the clown ruin. (#44595)
* welp

* h

* Superlube
2019-06-18 21:37:11 +02:00
nemvar d9761d448d Adds primal farming implements. (#44388)
About The Pull Request

Adds a rake (reskinned cultivator) and a wooden hatchet to the ashwalker base. Replaces their bucket with a wooden bucket.

Added crafting recipes for the rake and wooden bucket.
Why It's Good For The Game

It looks more flavourful (inb4 where did they get the wood from) and adds a bit of functionality to unused content (i.e. ashwalker farming).
Changelog

cl
add: Added wooden farming implements to the ashwalker base.
add: Makes rakes and wooden buckets craftable.
/cl
2019-06-17 13:34:15 +12:00
nemvar 527dadf76a Gives the ashlizards a puddle. (#44359)
About The Pull Request

Replaces the water tanks in the ashlizard base with a puddle.

Fixes #44308
Why It's Good For The Game

Makes farming and making leather more attractive to the ashies. Both of which primal activities, so it fits pretty good. It also looks less silly than a modern water tank.

Damn, with all these small ashlizard buffs, they are soon going to dominate the station every round.
Changelog

cl
tweak: Replaced the water tank in the ashlizard base with a puddle.
/cl
2019-06-10 10:33:01 +12:00
Nalzul 47700b8679 Allows you to wear the caution sign + new sprite for the caution sign (#44289)
* +Sprite +Repath

* Adds 5 brute armor
2019-06-04 11:48:47 -04:00
AnturK d8078e1452 Adds system for randomized semi-persistent chem reactions. (#44094)
Generates parametrized randomized recipe and resets them every x days.
One example reaction added, with recipe available in space ruin (or through experimentation of course).
There's a few obvious improvements to the randomization system but i feel this is good enough to start some discussion. Still need to decide how far should conflict resolution go.
2019-06-01 09:31:05 +12:00
vuonojenmustaturska 6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
JJRcop 5d96a2c5dd Remove infectability from xeno nest lavaland ruin (#43616)
* Remove live eggs from xeno nest lavaland ruin

* Remove dead facehuggers from xeno lavaland ruin
2019-04-16 22:05:31 +12:00
81Denton 6510fc7870 Standardize cable colors across maps (#43599)
This PR standardizes cable colors: Power source to SMES is red, SMES to
main grid is yellow. Cables that can connect the main grid to AI
sat/telecomms sat are cyan.

It also fixes some odd wiring at the Pubby incinerator, the zoo ruin and
the BMP ship ruin.

This would probably be a good testmerge candidate, since it touches a lot
of map code. Aside from the three files where I tweaked/fixed cables, the
only effect should be different colors.

Cable colors are all over the place, which causes a lot of confusion for
players that haven't memorized every single area's cable layout. Cables
are probably the smallest and most annoying objects to interact with
ingame, so what they're doing should be obvious at first glance.

I chose red for power source -> SMES wires, since these are most likely
to really hurt when you touch them. Yellow is IMO the best color for the
main grid, since it doesn't overlap with scrubber pipes like red cables
do.
2019-04-14 21:44:04 -07:00
Tad Hardesty 1569642728 Fix incorrect APC pixel offsets in maps (#43539)
* Add additional functionality and logging to update paths script

* Fix incorrect APC pixel offsets
2019-04-11 10:47:30 +02:00
81Denton d6b886db74 Fix bus ruin (#43551)
This fixes the bus ruin, the citrus fruit is in the driver's seat now
2019-04-10 21:20:16 -07:00
ShizCalev f1f0c9487e Revamp Donutstation engineering/supermatter rooms (#43371)
Revamped Donutstation's engineering and supermatter rooms to fix a number
of issues that prevented proper functionality, and resolved numerous
aesthetic complaints.

Fixed Jones actions on a couple away mission fridges.
2019-03-31 12:38:19 -07:00
ShizCalev c1f7d01334 Repath /obj/structure/chair/office/dark to /obj/structure/chair/office (#43269)
The parent was just a dummy path, no sense having it really.
2019-03-26 20:43:30 -07:00
Tlaltecuhtli 9a47dce5a4 Fix empty medkits in some ruins (#43229) 2019-03-21 12:29:32 -07:00
81Denton 521a703fdf Clarifies syndicate lavaland/space flavor text (#43115) 2019-03-14 09:56:41 -04:00
skoglol cbecd7a93a Another fridge access pass (#43012)
Removes access restriction on fridges and meat fridges in areas where you
shouldn't be expected to have kitchen access. Notably, everywhere that is not
the main station kitchen. I didn't think to check this in #41923.
2019-03-05 21:12:34 -08:00
WJohn 6f959e7192 Slightly tweaks syndie lavaland/listening post bases. (#42913)
When the circuit lab was added and subsequently removed from the lavaland base, it left a poorly lit spot by medbay. Also adds explosive warnings in the test chamber to hopefully dissuade people from blowing the whole base up.
2019-02-26 21:39:51 -05:00
granpawalton 24d5c9f1c3 Fix layer 3 injectors, replace a scrubber with pump on Syndicate Lavaland base (#42747) 2019-02-12 20:22:01 -08:00
Rob Bailey 69e217d8d9 [READY] I got guns (#41804)
cl actioninja\memager
refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible.
add: Guns can now be racked. This is the default action unless the magazine is empty.
add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand.
tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand
add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc.
add: All ballistic gun sounds are controlled by variables instead of hardcoded usages.
tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack.
tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables.
refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same.
imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example.
soundadd: Remixed versions of the shotgun and base gun firesound
soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound.
soundadd: Lots of new weapon operation sounds such as racking and bolts and the like.
imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager.
imageadd: All gun sprites that were pointing to the left have been flipped to point to the right.
balance: Shotguns now can be pumped faster.
balance: Bulldog can now be tac reloaded
balance: Sawn off shotguns now have an accuracy penalty and recoil
/cl
2019-02-04 10:27:01 +13:00
Tad Hardesty 84c06057ce Fix untold mountains of minor mapping issues (#42541)
* Fix stacked turfs

* Fix cables with pixel offsets

* Fix outdated icon state overrides
2019-01-28 02:42:17 -05:00
Jack Edge 7e49d1d022 The signature barman booze sliding is now granted by their beer goggles
🆑 coiax
tweak: Bartenders now gain their ability to "booze slide" from their
beer googles, rather than from a granter book in their backpacks.
/🆑

Less action button clutter, the ability to disable it if required (at
the cost of style), still keeping it possible for non-roundstart bartenders
(provided of course, you have the shades for it), as well as a less
janky way of checking than just looking through someone's action
buttons.
2019-01-10 19:23:28 +00:00
WJohn c3ad5fbd24 Fix shuttle rotation of decal corners (#42261)
Had to touch a lot of maps because their directions were wrong in the icons
file, so when I changed those every map that had these needed updating. I've
added a script called cornersfix to mapmerge2/map_scripts for downstream
servers.
2019-01-09 12:55:15 -08:00
Jordan Brown 54ac9674a3 Merge pull request #42092 from 81Denton/remove-AT
Fixes AT errors for CentCom+Hilbert's hotel
2019-01-03 11:32:38 -05:00
subject217 5a52f8a7bf Removes smugglers satchels (#42166)
* Removes smugglers satchels

I love the cutie reading this

* remove smuggler's satchel from code

* removes all smugglers' satchel persistence code

* removes remaining things

storage component for smugglers, the miracle ruin (uses smugglers), the dme
2019-01-02 15:28:26 -05:00
Denton 0a165b5b9e Fixes AT errors for CentCom+Hilbert's hotel 2018-12-26 21:25:32 +01:00
granpawalton d97ebed5a1 Fixes hilbertshoteltestingsite.dmm roundstart atmos (#41935)
Fixes atmos being different between adjacent tiles at roundstart in hilbertshoteltestingsite.dmm

* creates new instance for when stairs are in space

* almost forgot there were 3 different types of stairs
2018-12-16 13:06:56 +13:00
ShizCalev e7cc2074c6 Fixes missing decal icons, repaths food cleanables to cleanable/food (#41573) 2018-11-28 23:12:35 -05:00
4dplanner ce0828a98e Tendrils are now structure based [READY] (#41554)
* Tendrils are now structure based

* Re-adds tendril wipe achievement

neatens up ash walker variables
gets rid of unnecessary variables in hivelord

* Marks spawner children as admin spawned
2018-11-19 14:36:33 -05:00
Denton 0d9a0a349f Various map fixes 2018-11-17 08:48:48 +01:00
ShizCalev 0440e14557 Cleans up dead area paths. Removes dead music var. (#41429) 2018-11-13 01:31:28 -05:00
ShizCalev 85a71ac26b Fix exosuit console issues (#41303)
- Fixed exosuit console showing some code by accident.
- Restored the ability to send EMP pulses via the exosuit console
- Fixed tracking beacons being added to mechas located at ruins allowing you to
  metagame their spawning.
- Fixed exosuit consoles presenting some values via scientific notation (ie
  pressure being 3.258e-5)
2018-11-12 17:56:57 -08:00
ShizCalev a2ee6e25ae Revert "Exosuit console fixes"
This reverts commit cfec5f6e82.
2018-11-04 10:10:16 -05:00
ShizCalev cfec5f6e82 Exosuit console fixes 2018-11-04 10:09:22 -05:00
TheDreamweaver d464fd04d7 [SUPER DUPER EXTRA READY] Hilbert's Hotel (#41029)
* Initial stage

* final changes?

* Tweaks

* removed bad variables

* Fixed more bad vars

* is this map merged?

* spelling fix

* spelling fix

Co-Authored-By: TheDreamweaver <austin.j.rickli@gmail.com>

* Map fix?

* now this is map merger

* Fixed summoning edge cases

* Fixed spelling mistakes, Added better handling of sphere removal, Added sphere to the cargo shuttle blacklist, Made the "mystery" more dynamic

* Added better handling of stored mob summoning

* Removed redundant code.

* Made the jukebox actually accessible

* Tweaked it so that no maps would need to be loaded on Init

* comment commit

* No src

* Fixed spelling and getting trapped in rocks

* Fixed spawned-in hotel checks

* Blacklisted hotel are from blueprints and migrated storage handling from door to area.

* Prevents observing mobs (ghosts, camera entities) from getting stored.

* Condensed an if statement

* The hotel can now be used on another mob to invite them to the hotel. All living mob types can now exit out the hotel door.

* Fixed wrong user getting prompted when hotel was used on someone else.

* Added peepholes to hotel doors that can be used via AltClick.

* For the grammar lovers.
2018-11-01 15:40:31 -04:00
Shdorsh 9343d9e70a [READY]Removal of circuits (#41108)
* Delete integrated_circuit.dm

* Delete integrated_electronics.dm

* Delete pins.dm

* Delete wirer.dm

* Delete helpers.dm

* Delete printer.dm

* Delete analyzer.dm

* Delete debugger.dm

* Delete detailer.dm

* Delete assemblies.dm

* Delete saved_circuits.dm

* Delete boolean_pin.dm

* Delete char_pin.dm

* Delete color_pin.dm

* Delete dir_pin.dm

* Delete index_pin.dm

* Delete list_pin.dm

* Delete number_pin.dm

* Delete ref_pin.dm

* Delete selfref_pin.dm

* Delete string_pin.dm

* Delete passive.dm

* Delete power.dm

* Delete access.dm

* Delete arithmetic.dm

* Delete converters.dm

* Delete data_transfer.dm

* Delete input.dm

* Delete lists.dm

* Delete logic.dm

* Delete manipulation.dm

* Delete memory.dm

* Delete output.dm

* Delete power.dm

* Delete reagents.dm

* Delete smart.dm

* Delete text.dm

* Delete time.dm

* Delete trig.dm

* Update tgstation.dme

* Update multitool.dm

* Delete circuit.dm

* Update tgstation.dme

* Update netdata.dm

* Update ntnet_interface.dm

* stuff

* Update packs.dm

* Update electronics_designs.dm

* Update electronics_designs.dm

* Update multitool.dm

* Update cavity_implant.dm

* Update cards_ids.dm

* Update walls.dm

* Update hostile.dm

* Update all_nodes.dm

* removes circuits from maps

* Revert "removes circuits from maps"

This reverts commit 14daf7770220a8a1d7a8fa497c92d9c866939160.

* Removes circuits lab from all maps

* removes circuits lab from lavaland syndicate base

* fixes space tiles under windows on meta

* Deltastation fixes

* Update multitool.dm

* Update flavor_misc.dm

* Replaces Box circuits with nanites
2018-10-31 15:17:04 -04:00