25 Commits

Include renames

Author	SHA1	Message	Date
MigratingcocofruitandGitHub	26a884e70a	Engineering machinery and consoles area detection refactor (#26716) ... * Gravity generator, Atmos Control Computers, and Station Alert Computers now work by area rather than Z_level * Cameras get added to network depending on ancestor area * Station Alert console work by area * Adds a check so we don't get_area on a null variable * Gravgen also checks for z level. Area check now includes some types of ruins that weren't checked * Keeps everything on the Z level. Atmos alert computer now iterates over alarm, but still presesents area names * Engineering monitor gets networks from the area it is placed in * Adds missing area prototype to the prototype list * moves the area check to a function * reject legs, return to snek. * Revert "reject legs, return to snek." This reverts commit 1dfc2c4454. * I don't know what happened with paradise.dme, but it seems ok now * Requested style changes and remove redundant nulls * oops * Another empty line removed	2024-10-10 09:49:56 +00:00
7 people	32719e2f99	Adds map: EmeraldStation (NSS Diagoras) (#26438) ... * fleshed out engi and asteroid * command work * more department fleshing out: sec * sec work * perma work * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * med and dorms fleshing out * sci and service fleshing out * Update EmeraldStation.dmm * APCs done + detailing * Update EmeraldStation.dmm * wire work * more wire work * wires and LIGHTS * ATMOS DONE now onto DECOR * AI/status monitors * intercoms and newscasters * Wall items and cameras! * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * moved the file to the correct area * bugfixes, starting up the map * refining the asteroid * merge fixes * logs of bugstomping * more bugfixing * bugfixing * bugfixin * trying to make the stupid lava work * adds plasma vent for test * more testing * swapped file places * vents work now! * Update paradise.dme * vent sprite update * file corrections * Asteroid MILLA changes * adds a new MILLA atmos type * Build MILLA * oopsie * fixes * removed testing code * reverts map start * reverts the atmos change * respriting geyser * comments * Update code/__DEFINES/atmospherics_defines.dm Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update geyser.dmi * Update paradise.dme * fixing past merges * adds some missing items from merges * reverting * reverts changes again * deleted unused file * oops forgot nearspace areas * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/turfs/simulated/floor/lava.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/area/ss13_areas/engineering_areas.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/turfs/simulated/floor/lava.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Lots of map fixes * Update EmeraldStation.dmm * trying to unfuck the milla merge * removed station from dme * fixes/small tweaks/suggested changes * removed errant turret * redid telecomms * Update EmeraldStation.dmm * rebuilding everything * redoing security * more sec work * perma shaped up + more items * renamed properly this time * resetting atmos code * more secwork and move papers off varedits * more secwork + dorms + funeral services * added new areas + pipe/wires/floors * security electrified windows/wires/alarms/lights * cameras, dorms pipes/ires/alarms/apcs * merged * disposals * lots of wall things + added map datum for testing * pipe fix for linter * fiddled with maints * minor maint edits * fixes + maint work * more bugfix * even more bugfixing * MORE nearspace fixing * dumb nearspace fix * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * a LOT of fixes + door access * disposal pipe update script * oops linter fixes * fixed viro button runtime * finished maints + space decor * removed hall light switches * fixed solars areas * removed errant lattice * remove agent B from asteroid * wall bump placement refining * apc fix * bugfixing * minor maint change * bugfixing * burn tile on node fix * changed official name * bugfixing * added genetics locker+figures * bug hunting (buttons mostly) * added firelocks. oops * added temp webmap + bugfix * Update emeraldstation.dmm * new webmap. again * added the perma tools * nanomaps * bug fixes, fixes, and more fixes * more tweaks * cable fix * more bugfixing * Update emeraldstation.dmm * tiny fix * fix AI sat turrets * more bugfixing * MORE bugfixing * bugfix + ruins soundfile * pipe bugfix * fixed toxins pipes. junctions bad? * swimwear :) * remove errant QM gps * rnd shutter button missing * potato layering fix * add bridge request console * fix window tint in interrogation * added some clothes * nanomaps2, asset boogaloo * modified an empty hall, added some perma cams, minor fixed * forgot to save before push oops * widens sci maint hall + bugfix * gives theatre its autodrobe back! * moved borg spawns * moves nuke op default spot * new asteroid mix + botany tweak * adds cremator button * new sign + moved pod + bugfixing * cable fix * engine, sci chem, and surgery tweaks * more bugfixes and tweaks * more tweaks * adds a few windows back to robotics * bar was missing pun pun! * corrected misplaced atmos machines * re-added the bathroom * fixes atmos waste disposal injector * modified mr potato * changed bathroom area * minor toxins tweak * small wall decor tweaks * removes errant lights * removes errant opier * LOTS of fixes/tweaks + adds CO2 to asteroid * gave maint some boxes + cable fix * duped brig lock * adds masks to medbay storage * adds missing gues passes * cleanup from kitchen rework * gives solars enough glass to complete it * adds another defib to cryo pods * makes asteroid sign fireproof * perma maint now opens with virus + bugfixs * bugfixing + adds missing holopads * more holopads + bugfix * adds some smoke vendors * kitchen area tweak * fixed errant rack * rearranged/spread out cig vendors * moved a cig machine again * added RD tint button * undid a brig area change * removed errant posters * added filing cabinets + bugfix * maint morgue tray fix * adjusted chapel + bugfix * fixed palms + minor sec floor tweak * adds forgotten magi and clown starts * gave engi a shower * reworked robotics + atmos bugfix * geysers now work at 1/10 capacity when overpressure * bugfixing + tweaked overrides/variables * rework warden office * bugfixes + adds some holopads * added missing bio shutter * more small tweaks * adds RnD rework + gives mag some things * fixed fabricators * tweaked robo + added rnd server board * added rnd backup circuit * bugfixing * bugfixing again * bugfixing * fabricator fix --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>	2024-09-13 18:18:25 +00:00
CRUNCHandGitHub	2b5cf38bbf	Changes Area Classification of Farragus Science & Cargo Solar Arrays, Standardizes Solar Areas. (#26458) ... * Update cerestation.dmm * Update cerestation.dmm * Standardized Solar Icons and Names * Area Reconstruction * area correction * The other correction. * Update cerestation.dmm	2024-08-19 12:28:47 +00:00
warriorstar-orionandGitHub	5a897730c2	fix: Make ruin area names more consistent. (#26481)	2024-08-17 14:10:48 +00:00
warriorstar-orionandGitHub	20f8fd10e3	remap: Farragus Cargo. (#26042) ... * remap: Farragus Cargo. * fix rock edges and struts * docking ports aren't nearspace * separate atmos/EVA in starboard south, fix doors, add store trash * lint fix * i uh forget * qm windows, maints improvements * more maints decorating * fix electrochromic area * tiny bit more mining-themed * sean review #1 * fix windoor access on cargo office * 1080p review 1 * accidentally uncommited changes from above review * one last grilled spawner replaced * misclick * fix disposals corners and y-junction * completely forgot to update sec telepads * as many APCs as possible pulled into maints * fix conflicted tile * remove disconnected disposal pipe * fix disposals redirecting into psych office	2024-08-04 17:27:37 +00:00
warriorstar-orionandGitHub	7f219de67f	refactor: move req console config to areas (#26051) ... * refactor: move req console config to areas * improve dmdoc * just set this to what the area has	2024-07-01 08:55:30 +00:00
warriorstar-orionandGitHub	5f2b7d7cd0	refactor: remove many unused areas. (#25893) ... * refactor: remove many unused areas. * correct pod number	2024-06-20 11:38:33 +00:00
warriorstar-orionandGitHub	a1dbb9a2c4	meta: Remove AI foyer area, remap wallbumps. (#25821)	2024-06-12 18:34:01 +00:00
ZackandGitHub	eca1df9ce5	Added science lobby area's to help the station not put stress on air alarms or fire alarms on Meta, delta and box station (#25449) ... * Update science_areas.dm * Area and science lobby	2024-05-29 20:57:19 +00:00
9 people	5a68c5f6d3	Explorer Redux (#24202) ... * WE'RE SO BACK * LET THERE BE SOUND * More bugs * fixes * sound * hmm * clothing sprites + minor code changes to clothes * meestake * spritening * YARR * hiss * Cyberiad explorer remap * hand telover * delta days * rooms done * VENDOR * Mapping done * Salvage mapped * qol * Forgot the hivelord. * woops * oops redux * reviews and more * consistency * Update code/game/jobs/job_globals.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * the doorening * redooring * modsuit * more reviews * the plasmamamninigngg * add random salvage generation across space ruins * add blackbox tracking for salvage sold * gun * deconflicts and reviews * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * all conversations resolved * maybe work now? * please no more, too many apcs * Update code/modules/mob/living/simple_animal/corpse.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * PDA * conflicts * more conflicts * maybe all conflcits? * wait fuck * maybe fixed??? * KIDAN SPRITES * MAYBE? * access fixes * explorer hotfixes 1: - fixes space pirates dying in space - gives explorers ORM access - box: fixes access on NTR airlock - box: fixes naming on BS airlock - box: adds expedition access to mail sorting room * add salvage selling back * NOT FOR SALE * oh my god actually sell the fucking salvage this time * maybe fine now? * carpover * NO MORE CABLE * balance tweaks * some depot loot updates * merge conflict * deconflicted??? * woops more oversights * skirts, bombers, exploredrobe code + sprites * woops (again) * deconflicting * remove old explorer room again * Hat fix * minor changes to sprites and code for hats * yarrr fix 1 * first fixes * don't drop loot from syndies gibbed by depot destruction * add selling back with new signal based system * speedmerge this shit * minor changes to collars/bomber resprite * docking port in * ruins * WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN * no more murder hallway on whiteship * undelete meson sunglasses, redelete uristrunes * BOOTY BAGS * don't drop ashdrake loot from crusher kills * box: fix ntrep fax, add explorer access to ORMroom * add meson sunglasses item icon back * fix cere handtele, meta shutter control, death sound arg * cleaning up * she mosins on my russian till i dj station * Update code/modules/clothing/head/soft_caps.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>	2024-05-27 19:27:59 +00:00
4 people	9e04910ce6	Adds the Nuclear training bomb, second try (#25352) ... * Adds the Nuclear training bomb * boxstation * other maps * moved camera * missing cable * last fixes * delta, last fix * Update code/datums/wires/nuclearbomb_wires.dm Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> * cyberiad missing floor --------- Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>	2024-05-14 12:53:00 +00:00
3 people	24aadc9212	cere: upgrade and expand telepad network (#25089) ... * cere: upgrade and expand telepad network * no parts in cere telepads to avoid taking advantage of high-level parts * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * fix a bunch of pre-merge issues * whoopsies * ahhhhhh * review changes #1 * fix horrid doublewalls in evac --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>	2024-04-19 18:04:54 +00:00
4 people	864520f688	Fix dynamic lighting in secret clown HQ (#24181) ... * Make clown HQ require power * Added APC to area * Superfluous spacing removed. * There is only one thing worse than a DMM conflict --------- Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>	2024-03-18 17:56:40 +00:00
4 people	0667f20681	move all EOL comments on typepath names to dmdoc (#23928) ... * move all EOL comments on typepath names to dmdoc * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> --------- Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>	2024-03-01 20:05:49 +00:00
ZackandGitHub	ce445b09fe	Removes a couple of area's that are no longer being used (#24196) ... * removed a couple of areas * Update command_areas.dm * fixed a few things	2024-02-19 19:06:00 +00:00
3 people	0d5986fc5c	Fixes Cyberiad Issues (#24131) ... * Area for courtroom * arrivals done * fixed VSC * Pt1 * funny * Pt2 * Pt3 * light * PT5 * fixed a issue * PT6 * code/game/area/ss13_areas/legal_areas.dm * Update cyberiad.dmm * Update legal_areas.dm * fixed what warriorstar-orion suggested * removed two more requst consoles * why do I keep forgetting --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>	2024-02-19 11:48:45 +00:00
Henri215andGitHub	aa3124a4fc	Removes one map area that was not being utilized (#24186)	2024-02-19 11:39:41 +00:00
3 people	c8dfc82a1d	Fixes the area around medbay on boxstation (#24026) ... * Area added to map medbay thru VSC * Maps medbay * fixed a issue * Update code/game/area/ss13_areas/medical_areas.dm Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> * light switch * Update medical_areas.dm * Update medical_areas.dm * Update cyberiad.dmm * Update medical_areas.dm * Update medical_areas.dm * removed a light switch wall * Update medical_areas.dm --------- Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>	2024-02-13 17:23:22 +00:00
3 people	241892e9ec	Maps the areas in the main hallway's on delta map (#23831) ... * damn I tripped * fixed what DGamerL suggested * Fixed a hallway * Fixed what Henri215 Suggested * Update public_areas.dm * Update delta.dmm * fixed a fail * Cameras * removed the not needed light switchs * Fixed what Henri215 suggested * remove a couple light switches * removed a camera * removed a camera and added a light --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>	2024-02-13 13:47:48 +00:00
warriorstar-orionandGitHub	4341e0c762	add aft/stbd solar area icons (#23984)	2024-02-06 18:26:01 +00:00
Venuska1117andGitHub	325cd3abf4	fix that unisex restroom on box (#23072)	2023-11-21 23:08:44 +00:00
DenizandGitHub	674ca2fb69	reviews (#22806)	2023-11-14 13:18:01 +00:00
3 people	0ec620dc7f	Fixes some fugly cabling and pipe spots on delta, and a single tile on box, and adds a new mapping area (#22830) ... * fixes some funky spots on delta, and a single tile on box * probably like this is better * oops * there we are * Update delta.dmm * why'd that tile conflict * fixed i think --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>	2023-11-01 22:15:34 +00:00
ContrabangandGitHub	d7d68d126f	Adds CI to prevent areas on station without APCs (#22515) ... * areas apcs * oops * okay lets try this! * these too * a lot more changes * cmon	2023-10-27 18:11:10 +01:00
ContrabangandGitHub	65ab4a5d89	Refactors station areas to be /area/station subtypes (#21681) ... * areas * progress... * death hatred and murder * get current master maps * hoooly shit i can load up the maps * it compiles now * map changes * fixes some unintended stuff * make the .dme right * fix mixed space+tab indents * more space-tab fixes * CI, please show me more than 1 CI fail at a time * UPDATE PATHS!!! * none of the stations had it anyways, but fixed * mint wasnt actually deleted, my bad * epic random CI fail for no reason * i beg you, CI * dont delete anything * okay THAT should work now * okay get master maps and rerun * okay THEN run update paths * actually done now * oops	2023-09-06 17:37:50 +01:00