Commit Graph

367 Commits

Author SHA1 Message Date
kingofkosmos
8768b6b3b5 Removes unused & undefined spans (#47436)
* Removes all instances of 'caution', 'error' and 'notify'.

* Removes span classes which were either not used at all or were used very infrequently.
2019-10-30 02:00:11 -07:00
carlarctg
6a65a85fe0 Reflector Trenchcoat replaces armory reflective vest (#47116)
* reflector vested

* denton REE

* Update hats.dmi

* a

* hmjhjmhfmjhmgfmjgm
2019-10-22 04:35:14 -07:00
skoglol
a7b02fb6c7 Removes air mix tanks (#46480)
* Removes air mix tanks.

* and the maps.
2019-10-02 12:01:23 +02:00
Firecage
b18e8ba52b Makes Plastitanium Windows deconstructable and children of Reinforced Windows. (#46679)
* Makes plastitanium windows children of reinforced windows.

* Unanchored variety isn't fully tooled in now.

* Path moved to plasma/reinforced/plastitanium

* Fixes a blunder about neglecting a mapping path change.
2019-09-25 18:25:48 -07:00
skoglol
896a581ef6 Tweaks space cave generation (#46591)
* Removes space cave generation.

* removes flora for space, replaced some mineral walls.
2019-09-25 18:12:46 -07:00
variableundefined
900483ba44 Remove redundant structure/chair/wood/normal typepath (#46443) 2019-09-15 00:29:23 -07:00
moo
74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
Rob Bailey
0c6fabceb0 Merge pull request #45680 from 81Denton/unfuck_c4
Refactors C4/X4
2019-08-05 19:09:57 -07:00
ishitbyabullet
71277af9d3 Improved Cabin Away Mission (#45618)
* The map itself

I hope it won't PR on /tg/station immediately.

* ok lavaland monster dmi thank you

"bruh you added two sprites oh shit im about to m-m-m-malfuncti-" *BOOM*

* cabin building stuff

Still need to merge master.

* Ninja's uniform PR got merged.

Good thing I used, like, only one jumpsuit for the entire map. I hope this merges before someone changes winter coats though.

* lmao

* MrDoomBringer forgot a few things

obj/iced_abductor. that's an ayy lmao moment.

Besides that, the block should work. Just don't destroy it before the round begins otherwise you see this: https://i.imgur.com/K3GGnqy.png

Proof that this works: https://i.imgur.com/MxVO0Og.png

* no more claustrophobic medbay

It doesn't look as good as I want it to. It also feels way too fucking cramped.
2019-08-05 01:37:11 -07:00
Denton
d98df6e063 Refactors plastic explosives
y
2019-08-02 22:31:05 +02: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
tralezab
e94b6139cf Fixes some issues with balloons (#45554)
* Ok, this was just embarrassing

* uno

* dos

* tres

* cuatro

* wait, these vending machines are crazy similar...?
2019-07-29 18:51:41 -07:00
81Denton
c4934aa959 Replaces snowdin gas miners with gas turfs (#45409) 2019-07-25 02:15:21 -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
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
ishitbyabullet
782138e964 Improved Beach Away Mission (#44673)
* Beach

Please work and don't pr on real tgstation

* this is an update, i guess

please work

* Unclimbable invisible walls.

Looks like only teleportation can make you move in deep ocean water now.

Thanks for all the help, Wjohnston.
2019-06-23 21:51:31 +02: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
Emmett Gaines
9083e31410 Make setting stationary dock area_type no longer required (#44511)
Like it says on the tin, mappers no longer need to set the stationary
dock area type as it will use the area type of whatever it starts on.
This is how they all worked anyway, but you can still set it yourself if
you find some very strange usecase for having a different area type.
2019-06-14 12:22:42 -07: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
vuonojenmustaturska
94c42e3a45 Removes VR (#43832)
* dunk

* this too
2019-05-12 13:33:06 -04:00
ShizCalev
41c53f5ec5 removes VR from ss13 camera network (#43828) 2019-05-07 16:07:47 -04:00
Whoneedspacee
5b89dea70f [Ready] The Virtual Reality Hub (#42879)
About The Pull Request

VR sleepers now lead to the VR Hub, a place with a bunch of portals that lead you to other areas, or just has chill stuff like a bar. Includes portals to all the old vr maps, the megafauna training simulator map, a soon to be minecraft map, and my crappy game runner where you run away from falling tiles and fight to be the last person to survive. Merges murderdome and syndicate trainer into the vr hub map so they spawn every time with vr. Recall portals now can have multiple exits to support the old vr waypoint system from the hub. Also moves a lot of stuff around in the files to make it more organized. There's now also a ghost role that can access VR as well with infinite spawns.

VR NOW HAS A CONFIG OPTION SO ENABLE IT OR VR WILL NOT WORK.
Why It's Good For The Game

Being a ghost is boring for most people, it's nice to have a place for people to hang out rather than just leave the server. This is also a nice place where people can put gamemodes they're testing or other fun little minigames that can't be main gamemodes. VR currently is not used by really anyone so I don't see anyone getting bothered by this PR as well.
2019-04-22 12:16:11 +12: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
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
Rob Bailey
ee33e9c6a8 [READY] The war on stun based combat, Phase I: Fuck ranged stuns (#42930)
Nukes the hybrid taser from orbit. Everywhere that spawned it now provides a disabler instead. Standard sec issue? Disabler. Armory? Disabler rack.
Want something with more punch? Beg the warden for a shotgun or an energy gun.
The hybrid taser itself has not been removed from the codebase.
Also removes the stun from the advanced energy gun so it doesn't just become the late game secret powerhouse.
Hoslaser keeps it, but only gets three shots instead of five.
The ebow has been COMPLETELY RUINED as well. See the changelog for details I'm too lazy to copypaste.
Why It's Good For The Game

Fuck stun based combat.
Sec still have their stunbatons, collapsible batons still exist, pepperspray still exists, flashbangs still exist. but now any fight involving sec or anyone who has robusted a sec officer will be less ranged instastun bullshittery.
Changelog

cl
balance: New NT regulations have replaced the standard issue hybrid taser with a pure disabler.
balance: Also fuck the stun mode on the advanced energy gun who thought that was a good idea.
balance: The hos's laser can only fire three taser shots instead of five.
balance: Energy crossbows have been reworked. They no longer paralyze, but instead heavily blur vision, apply a huge burst of stamina damage, and knock you on your ass for one second. Two shots is enough to down someone from stamina crit on both the mini and large versions. The blur lasts for 10 seconds.
balance: The price of the mini ebow has been reduced to 10TC to compensate for this weaker effect.
tweak: The ED-209 is now built with a DRAGnet and fires netshot instead of taser bolts.
balance: Stunshells can no longer be produced in any lathe.
balance: The "pacifier" mech taser can no longer be built.
/cl
2019-03-08 10:30:50 +13: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
Whoneedspacee
6a70a982df [Ready] Megafauna VR Training Simulator (#42353)
* lava arena is now not the default for swoop attack

adds mass fire attack, sends fire lines out from the drake in 360 degrees

lava pools now have a chance to be spawned with the fire breath attack

adds greater delay for lava pools on lesser ash drake so they don't just all instantly get placed

lava arena doesn't needlessly recalculate the turfs it will be using every pass now

enraged state, procs when you try to escape from the lava arena attack without fighting it normally, colors the drake turns its brightness up as it glows, then shoots out fire everywhere, also heals the drake for 250 health.

fixes a bug where fire lines wouldn't appear if their range would put the calculated end turf outside the map

fixes a bug where indestructible open turfs would turn into basalt on the lava arena attack

fixes a bug where lava arena safe spots would be on indestructible closed turfs

drake swoops now have a greater default recovery time

* fixes stupid text error

* adds vr mining sleepers to the lavaland mining base which can be used to train with megafauna and test out other items

removes useless code from colossus's file including having a dead icon of the drake and butchering results

adds virtual versions of each megafauna which don't drop any items and are deleted upon death

adds the vr mining map

* adds virtual megafauna spawners and their respective icons, spawn 1 megafauna at their location and are indestructible

changes default virtual megafauna hunter gear to be more like the default mining gear

* adds more items to spawning in mining vr

megafauna spawner nests can no longer be pushed

virtual megafauna now have a limit to how far they can move away from their nest

adds arenas and fast bluespace tile paths to each megafauna spawner and gives the mining base some walls to protect it

* adds mining vr map to the away mission config

adds perm portals, linked two way portals who are linked by id and can be set in mapping files by editing instance

adds megafauna portals for the arenas

fixes up some junk on the mining vr map

adds a spawn delay for megafauna spawners after the linked megafaunas death

fixes a bug where bubblegum could teleport outside of his arena

* adds true spawn var to bubblegum to easily handle clones / virtual versions of it spawning

fixes bug where virtual legion would release the real legion when damaged

moves vr mining code to the away missions code to adhere to contributing.md

* converts map files to tgm

adds arena cleanup and fixes runtime bugs on virtual megafauna spawn and death

* reverts local drake changes

* fixes bug where drake corpses still had a gps signal

removes worthless include

* adds the crusher trophies to the vr mining kit

no more granting null achievements you stinky virtual megafauna

this map really didn't need to be 255x255 im sorry

* even smaller map wowee also please compile

* adds respawning item crates for the lavaland items and healing junk

even smaller map and some filler spaces for possible future bosses

removes lavaland map changes

mining vr now works properly with other vr maps and is randomly selected working with normal vr sleepers on station

fixes permanent being permanant my bad

* lavaland map stop being changed

* maybe a bit overkill with the amount of healing items

* reordering i guess but why is the rum gone

* work please

* Update Lavaland.dmm

* Update Lavaland.dmm

* adds force stop option to portals so you can choose to not chain teleports with non linked portals.dm

permanent portals now can be var edited mid game and still work (cool admin events? idk)

permanent portals are no longer deleted if they don't have a linked portal

adds one way portals, portals that lead somewhere but have no return portal. basically non hardlinked portals but able to be done in map and edit stuff

adds recall portals for the vr megafauna arenas, one way portals but you can recall to them by using a one time use spell (no it is not tied to your real mind it is tied to the vr mind)

virtual megafauna can no longer escape their arenas

moves some virtual megafauna procs to the main megafauna file to reduce needless code

* recall portals can now be chained and the portal recall spell can now go back in a stack reverse style

* adds boss rush mode, fight all of the bosses successively with only one break in the middle without dying

object spawners can now choose their datum spawner type through a var

moves some virtual megafauna code from the megafauna file to the megafauna spawner datum

* adds new goodies to the end of the boss rush

removes a lot of the copy pastad code in the vr megafauna

adds true spawn var, decides whether or not the megafauna should grant achievements or have an internal gps, used for bubblegum hallucinations and virtual megafauna

internal gps are now added on the base megafauna path

hierophant's crusher trophy no longer spawns at its beacon (let's be honest some people missed it because of this) so it works properly with the crusher loot var
2019-02-11 12:01:51 -05: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
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
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
a4dcb5e85f Snowdin fixes, VR tweak 2018-11-17 08:37:41 +01: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
Tad Hardesty
e31bb2c91e Set a z-level baseturf for Lavaland (#41113)
* Set a z-level baseturf for Lavaland

* Remove nigh-useless ZTRAIT_PLANET

* Remove planet_z helper from away missions
2018-10-26 13:32:34 -04:00
Denton
7cd17e8329 Removes unused access defines 2018-10-12 19:15:00 +02:00
ShizCalev
af1859f5fc Makes syndicate belts and backpacks fireproof (#40804) 2018-10-10 05:47:48 -04:00
81Denton
df9053bd17 Buttons are no longer indestructible (#40752)
* Buttons are no longer indestructible

* Makes CentCom/VR buttons indestructible
2018-10-08 10:37:07 -04:00
ShizCalev
d7ab884d26 Readd tile decals to academy (#40716) 2018-10-05 11:45:52 -07:00
AnturK
0396c7f298 Fixes tile icon in oldstation (#40682)
* Fixes tile icon in oldstation

* Academy whitered removal.
2018-10-04 16:32:29 -04:00
ShizCalev
a1c2eb3bf1 Fix dirty vars and broken floor tiles (#40313)
Fixed vareditted bonfires not properly igniting at round start.
Fixed vareditted pianos switching to minimoogs at round start.
Fixed some vareddited flashlights not turning on properly at round start.
Fixed all missing floor icons
Fixed bookcases at the Wild West away mission not being properly populated.
Fixes missing icon in DM for syndie playing cards.
Added support to change the burning icon of bonfires (right now there's the
normal on_fire and warm states, warm being more of a burning embers sort of
deal.)
2018-09-24 22:48:41 -07:00
ShizCalev
6d68ba4e9d Adds Waffle Co. brand monkey cubes 2018-09-21 19:17:55 -04:00
WJohn
e54f1d5342 The great floor tile purge (#40065)
* Converts all colored plasteel tiles to turf decals.

* Removes now deprecated floor icons and paths.

* Hotfixes on three maps.

* Moves script to its own folder.

* Fixes wild west.

* Fixes holodeck

* Fixes eye rape bug.

* Fixes meta and lavaland biodome ruin having some missing textures.
2018-09-05 22:14:31 +03:00
Tad Hardesty
141f558102 Fix atom ordering problem in map files (#39889)
Fixes a major mapping error introduced in #39816 and adds handling to the map merger to prevent it from happening again.

Keys need to be ordered movables, then turf(s), then area, otherwise our map reader acts weird. In-game this manifests as floor being placed in the dirt's underlays, such that after floor is crowbarred to plating the floor is still visually present (this is how I noticed the problem).

Fixes #39888.

Some map files still have stacked turfs. Our map reader supports this but it tends to cause other problems (e.g. atmos) so I'll try to look at those in the future.

X=$(find _maps -name '*.dmm'); tools/hooks/python.sh -m convert $X
2018-08-25 17:48:24 +12:00
WJohn
85c1fb9b0d Removes now obsolete floorgrime path and icon (#39816)
* Removes now obsolete floorgrime path and icon

* Whoops.

* Fixes me being a dummy.
2018-08-22 14:57:28 +03:00
WJohn
c5f7f68d36 Updates titanium and plastitanium floor sprites. (#39723)
New titanium floors! The intent here was to reduce the eye strain that the current max saturation fuckbois have, and make some floor tiles people might actually consider using. Right now the options are still pretty limited with blue, yellow etc only coming in full tiles, and I expect this will remain so until an actual greyscale rework comes along that shrinks the file size down from its bloated 4,000 sprites to something more reasonable and modular. Decals, perhaps?
2018-08-19 23:49:01 +12:00