Commit Graph

952 Commits

Author SHA1 Message Date
BluBerry016
ea904304ba Update sheet_types.dm (#6815) 2021-07-09 18:47:24 +12:00
BluBerry016
92a7aca465 [Semi-Modular] Yet Another NSS Journey Update (#6775)
* Yet Another NSS Journey Update

* LIGHT THAT MOTHER UP

* botany update
2021-07-09 01:30:52 +01:00
SkyratBot
562908a78e [MIRROR] Human Skin Hats (#6794)
* I made a hat that screams! (#60032)

* Human Skin Hats

Co-authored-by: YakumoChen <king_yoshi42@yahoo.com>
2021-07-08 10:45:58 +02:00
SkyratBot
d00afdebb9 [MIRROR] Catwalk Flooring (#6647)
* Catwalk Flooring (#59773)

* Catwalk Flooring

* a

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-02 16:43:51 +01:00
Matthew J
47c10f1781 Revert "[semi-modular] reagent forging (#6614)" (#6636)
This reverts commit ffa39629ed.
2021-07-01 13:33:53 +02:00
jjpark-kb
ffa39629ed [semi-modular] reagent forging (#6614)
* start of reagent forging

* reagent forging

* add the three items to ashwalker den
2021-06-30 23:36:12 +01:00
SkyratBot
a110c0a342 [MIRROR] Cooked steaks are once again edible. (#6577)
* Cooked steaks are once again edible.

* FF

* Update sheetifier.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-29 16:56:25 +01:00
OrionTheFox
31952d96ee [READY]Adds two new space ruins, tiny bit of framework for other future mapping (#6507)
* Adds Spaceship turfs (First iteration)

* Moves VG decals icons into turf/decals

* GPS Computer

Literally the survival pod one re-textured to work with any wall. Good for ruins

* Fluff/machinery

just read the fluff file ffs

* Hardspace Maps

yes they're based on HS:SB. They turned out well ok

* these arent even complete but im commiting

* hbg

* New sound for AI node, wall fixes

* pre-loaded tape go brrrr

poggers

* tweaks ai node values + ghostship loot

hh

* remove two unused files, move salvagepost ID

* craftable spaceship walls (hopefully) and le cool pre-recorded tape

* properly makes spaceshipshiz craftable/placeable

* adds totally-cool sprites for the spaceship stacks :)

they arent codersprites i worked hard on them :)

* salvagepost loot and anchoring

* adds juicy ai node sprite

thamk u hay, sorry i couldnt use the big icon im not good coder :(

* replace on-turf lattices with the decal version

* oops adds the gps computer to the generic spaceruin signal
2021-06-28 14:35:16 +01:00
SkyratBot
9c861af7b7 [MIRROR] Greyscale Mat Datum Stationary Smooth Tanks (#6544)
* Greyscale Mat Datum Stationary Smooth Tanks

* Update icon_smoothing.dm

Co-authored-by: Emmett Gaines <ninjanomnom@protonmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-27 16:37:32 +01:00
SkyratBot
665fe76566 [MIRROR] Modifies right click logic so that it is not the same priority as modifier keys. (#6498)
* Modifies right click logic so that it is not the same priority as modifier keys. (#59656)

Strips out the existing right click code - Due to the myriad of ways right clicking has been implemented, dedicated signals and procs for right clicking without modifiers are fundamentally incompatible with our system of primary and secondary attacks.

Adds additional signals to attacking code. These signals allow atoms to cancel the attack chain early on secondary attacks, or override the standard procs and not send signals to prevent any undesired behaviour from signal handlers.

Items that used RightClick procs have been converted to attack_hand_secondary.

The slaughter demon, having its own set of snowflake code as poor OOP principles have been applied in UnarmedAttack() procs with lacking calls to parent procs and arbitrary redefinition of behaviour, checks for a right click in its own UnarmedAttack() and performs a bodyslam off that.

Storage components now hijack the secondary attackby stage via signals to handle their opening and closing shortcuts on right click. When you right click a storage component equipped item with an object in your active hand, the object has an opportunity to perform its logic in pre secondary attack code and cancel the attack chain. If it does not cancel the attack chain in pre-attack, then the storage component takes over for attackby and, if possible, opens the relevant inventory and ends the attack chain.

The forensic scanner is a proof-of-concept of this working in action. With its scan logic moved from afterattack code to pre attack code for right clicking, right clicking with the scanner will now perform a scan where previously one was impossible. Left clicking still does what it always does - Scans at the very end of the attack chain.

The logic still isn't perfect - For example, you still can't attack containers in melee even in combat mode (you'll either open them or put your weapon into them regardless of which option you choose) - But this is a better setup overall which allows for items to at least override this behaviour in pre-attack if needed.

* Modifies right click logic so that it is not the same priority as modifier keys.

* a

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-27 16:10:15 +01:00
SkyratBot
5326760cb3 [MIRROR] Makes turfs persist their signals, uses this to optimize connect_loc (#6465)
* Makes turfs persist their signals, uses this to optimize connect_loc  (#59608)

* Makes turfs persist signals

* Splits connect_loc up into two elements, one for stuff that wishes to connect on behalf of something, and one for stuff that just wants to connect normally. Connecting on behalf of someone has a significant amount of overhead, so let's do this to keep things clear

* Converts all uses of connect_loc over to the new patterns

* Adds some comments, actually makes turfs persist signals

* There's no need to detach connect loc anymore, since all it does is unregister signals. Unregisters a signal from formorly decal'd turfs, and makes the changeturf signal persistance stuff actually work

* bro fuck documentation

* Changes from a var to a proc, prevents admemems and idiots

* Extra detail on why we do the copy post qdel

* Makes turfs persist their signals, uses this to optimize connect_loc

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-06-23 04:23:48 +01:00
SkyratBot
476ff93339 [MIRROR] Removes the fake error texture floor tiles. (#6371)
* Removes the fake error texture floor tiles. (#59693)

* Removing is improving

* Remove icon from dmi

* Inhands repurposed to error states

* Removes the fake error texture floor tiles.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-06-18 04:20:14 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
f8042b6306 [MIRROR] Adds Neon Carpet (#6302)
* Adds Neon Carpet (#59140)

Adds a couple varieties of neon carpet.
Makes decals care about their plane in addition to their layer.

* 0

* A

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-15 18:12:49 +01:00
SkyratBot
e1c7ca12d1 [MIRROR] Wrapping Paper GAGS (#6309)
* Convert wrapping paper sprites to GAGS (#59374)

Wrapping paper has been put through GAGS. You can set the base color and ribbon color with right click, then apply it to a package.

Co-authored-by: coiax <yellowbounder@ gmail.com>

* Wrapping Paper GAGS

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
2021-06-14 18:42:46 +12:00
Matthew J
5dc173b8a1 [NON-MODULAR] Modularizes the Material Glass / Windows Don't Create Instantly (#6113)
* hh

* hhh

* modularization
2021-06-05 17:20:12 +12:00
Gandalf
56a7766d1b Revert "Fixes master 514 (#5927)" (#5929)
This reverts commit aab764575a.
2021-05-25 03:24:45 +01:00
Gandalf
aab764575a Fixes master 514 (#5927)
* a

* l

* Update sheet_types.dm
2021-05-25 03:06:58 +01:00
BluBerry016
758e529d0e help me. (#5897) 2021-05-24 05:17:57 +01:00
Azarak
20db06c6d0 Liquids system (#4584)
* a

* a

* uncommentize

* aa

* Cache stuff

* Attrition

* blcok heights

* Abstractify reagents

* Lots of stuff

* stuff

* stuffs n drains

* Update drains.dm

* pumps and drains

* Update liquids.dm

* Ethanol burns, but only sometimes..

* color debug and big fuel tank boom fix

* watermeta

* Atmos moment

* Update living.dm

* burn

* anti-aliased icons, drain fix, liquids not on space

* Thermal energy + magboots fix

* Update liquids.dm

* Plumbing devices for liquids & engineering plumbing rcd

* From the creators of watermeta: WaterKilo

* Update WaterKiloStation.dmm

* Update WaterKiloStation.dmm

* Update _basemap.dm

* ocean biome generator

* Convert immutables when constructed over

* Forgot water pumps for station

* Update liquids.dm

* Ocean ruins

* cool looking blue ocean

* a

* a

* a

* weh

* a

* aa

* Merge pull request #1 from Azarak/errrrrror

Updates

* finishing touches

* aaa

* aaaa

* aaaa

* patch

* map fixes

* not so high pressurized now

* squeezing into bucket now removes 75% reagents, buckets get 100 volume

* empty ocean maps not used anymore

* reforged

* Update WaterKiloStation.dmm

* Update ocean_listening_outpost.dmm

* Update WaterKiloStation.dmm

* a

* ol

* 0

* Update liquids.dm

* Update _open.dm

* 0

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-24 02:43:57 +01:00
BluBerry016
3409c152ed [Semi-Modular] Resurrects #1304's Catwalk Changes (#5784)
* Catwalks are now above cables and piping.

* Revert map changes

* Revert oldstation change

* merge type

* Reimplements the cable check, but for space tiles only
2021-05-21 00:21:01 +01:00
SkyratBot
6005b418de [MIRROR] Fixes connect_loc related hard dels (#5657)
* Fixes connect_loc related hard dels (#58945)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>

* Fixes connect_loc related hard dels

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
2021-05-13 23:28:36 +02:00
SkyratBot
d8661d8420 [MIRROR] A bunch of new tile variants and dark tile decal. (#5640)
* A bunch of new tile variants and dark tile decal. (#59046)

* A bunch of new tile variants and dark tile decal.

Co-authored-by: manofpepsi <71612753+manofpepsi@users.noreply.github.com>
2021-05-13 14:23:19 +01:00
SkyratBot
6f0a08505b [MIRROR] The Tilening v1 (#5567)
* The Tilening v1 (#58932)

About The Pull Request

Ports smooth tiles from TGMC and textured tiles(with color tweaks) from Skyrat, TauCeti, and Eris. I was sent the sprites on discord and told it was from Skyrat, but the PR credits TauCeti AND Eris so im just going to credit all 3 thanks other servers :) Shoutout to @ Imaginos16 for all the help you rock.

Details: Resprites the grey, dark, and white tiles. Adds textured version of grey, dark, and white tiles with variations. Adds smooth tiles. New tiles added to reskinning with rotational support. Sprite changes to yellowsiding, plastic, materialfloor, plaque, reacharge_floor, sepia, chapel, and pinkblack to match the new base tiles. Small consistency adjustments on wood_tile and its broken states. Removes 2 unused dirt floor tiles. Reorganized icons\turf\floors.dmi. Sprite adjustments to various icons in icons\obj\tiles.dmi to match the updated sprites. Consistency resprites for glass_wire and tile_e. Small decal tweaks to fit the new base tiles.

dreamseeker_z7J61czzMG
Normal, Dark, White, Smooth + textured and size variations.
Some areas on Meta
Example of texture tile usage. NO mapping changes in this PR, thats for @ EOBGames to do ;)
Why It's Good For The Game

60 shades of grey yee yee ass old floor sprite days are over.
Changelog

🆑 Twaticus, Imaginos16
imageadd: Resprites (almost) all base floor tiles.
imageadd: Ports smooth tiles & textured versions of grey, black, and white tiles.
imageadd: Dance floor item icons are no longer massive.
/🆑

* The Tilening v1

* Update floors.dmi

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-09 23:35:24 +01:00
SkyratBot
5880be0168 [MIRROR] (code bounty) refactors all uses of Crossed() and Uncrossed() into signals sent to loc, tracked by connect_loc (#5524)
* (code bounty) refactors all uses of Crossed() and Uncrossed() into signals sent to loc, tracked by connect_loc

* WHEW THAT WAS EASY

* Update ammo.dm

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-07 22:39:27 +01:00
SkyratBot
c84d208fa6 [MIRROR] Sorts the majority of the rest of the unsorted chat (#5459)
* Sorts the majority of the rest of the unsorted chat

* 0.

* Update database_changelog.txt

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-06 23:48:08 +01:00
SkyratBot
5254b59612 [MIRROR] fixes fake chasms not dropping floortiles and borgs having their floor tiles deleted when reskinning (#5445)
* fixes fake chasms not dropping floortiles and borgs having their floor tiles deleted when reskinning

* Update robot_modules.dm

* Update robot_modules.dm

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-04 18:34:22 +01:00
SkyratBot
16c14a3575 [MIRROR] removes an unused sticky tape variable (#5421)
* removes an unused sticky tape variable  (#58856)

* removes an unused sticky tape variable

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-05-03 15:12:08 +01:00
SkyratBot
c15ed4eca0 [MIRROR] fixes poopy bronze tiles sstuff (#5237)
* fixes stuff made with bronze sheets deconstructing into tiles or not being able to make bronze golems (#58708)

* fixes poopy bronze tiles sstuff

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-02 00:07:16 +01:00
SkyratBot
966873beb4 [MIRROR] [READY] Tile Reskinning 2: Epic Winaloo (#5384)
* [READY] Tile Reskinning 2: Epic Winaloo

* AAA

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-01 14:25:42 +01:00
SkyratBot
7f083e7cb6 [MIRROR] Converts the atmos senstive component over to connect_loc (#5376)
* Converts the atmos senstive component over to connect_loc (#58266)

* Makes all uses of atmos_senstive pass in mapload as context

* Converts atmos senstive to connect_loc, does some general cleanup to the element, and makes it check the state of the tile the thing is on assuming creation didn't happen as a part of map loading

* Updates connect loc to match the new arg list

* Converts the atmos senstive component over to connect_loc

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-05-01 09:44:09 +01:00
SkyratBot
226cc91078 [MIRROR] New carpets & wood, version 2 (#5368)
* New carpets & wood, version 2 (#58797)

maxymax13, /vg/station, Citadel Station

I really wanted #58190 (A port of cit tiles, fucking ahewhads) but then nobody gave it mergies so i've redone it except not stale, not merge conflict'd and not using stack crafting instead of tile floofing!
I fully replaced the fugly diagonal one with my own nicer parquet one, adjusted red carpet to be less noisy, and made a damaged state.

Much more customization for wood flooring enjoyers, and it's obtainable ingame, in an out-of-the-way method! Think of the bar remodels you could do with this and some cans of paint! Now all we need is to make the vinyl siding and wood panel siding decals place-able...

3 new variations for wooden tiles are available (large, parquet, and tiled), the same way you color titanium tiles! Remember, use a screwdriver and not a crowbar!
A new red planetary pattern design is available for arcade carpet!

* New carpets & wood, version 2

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-05-01 09:39:56 +01:00
SkyratBot
a96d769804 [MIRROR] Adds a new obj_flag that prevents building on objects that shouldn't be built on. (#5272)
* Adds a new obj_flag that prevents building on objects that shouldn't be built on. (#58719)

Adds a new obj_flag that prevents building on objects that shouldn't be built on.
Adds it to the stasis bed and the sleeper, as well as some machines that become undense when the doors opens (nanite chambers, DNA scanners, suit storage unit, and gulag teleporter).

If I forgot any feel free to lmk.

Fixes #58528 (Operating table + stasis bed memes)

Some objects/machines that aren't dense (or become undense in certain states) shouldn't be able to be built upon, so this flag allows for specifying that you can't build on it.

* Adds a new obj_flag that prevents building on objects that shouldn't be built on.

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-04-28 02:17:58 +01:00
SkyratBot
2ab15aecb5 [MIRROR] Remove all gamemodes except Dynamic (#5173)
* Remove all gamemodes except Dynamic

* qaaaaaaaa

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:30 +01:00
SkyratBot
c418b139be [MIRROR] Ports Mail From Kiwi Take 2: Arconomy Class Mail (#5172)
* Ports Mail From Kiwi Take 2: Arconomy Class Mail

* Update wardrobes.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:20 +01:00
Winter Flare
e4160263a6 Makes Gear Harness craftable. Adds Loincloth to Dorm Vend. (#5103)
* Dorm Vend Tweaks

Adds Dorm Vendor Repack to Cargo
Adds Loincloth to Vendor
Adds Gear Harness to Leather Crafting

* Fixed Sheetcrafting
2021-04-23 21:45:29 +01:00
OrionTheFox
344f11b9c6 FIX FOR Eyepatch Left/Right Toggle! (#4949) (#5001)
* toggleable eyepatch side

the day we've been waiting for.,

* HAHAHAHHA WHOOPS

I FORGOT A CHECK TO MAKE SURE THAT ALL EYEWEAR SPRITES DIDNT TRY TO ADD _R TO THE END
2021-04-20 01:29:32 +01:00
Gandalf
553b707ba3 aaa (#5016) 2021-04-18 21:31:42 +01:00
Gandalf
9decfc49f6 Revert "toggleable eyepatch side (#4949)" (#4986)
This reverts commit 774824da18.
2021-04-17 19:45:43 +01:00
OrionTheFox
774824da18 toggleable eyepatch side (#4949)
the day we've been waiting for.,
2021-04-17 16:01:42 +01:00
Gandalf
b40d89db02 Security boot crunch (#4967)
* aaa

* Update miscellaneous.dm

* aaaa
2021-04-17 15:50:12 +01:00
SkyratBot
8e982516a4 [MIRROR] Space Cash Re$prite (#4769)
* Space Cash Re$prite (#58238)

imageadd: Space cash has been resprited

* Space Cash Re$prite

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-04-09 15:50:19 +01:00
SkyratBot
3dd2983ca0 [MIRROR] You can now manufacture bone gel (#4515)
* You can now manufacture bone gel

* Update others.dm

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-03 18:22:25 +01:00
SkyratBot
80cede3490 [MIRROR] Stack splitting now uses right click (#4283)
* Stack splitting now uses right click (#57837)

Co-authored-by: Arkatos <arkatos1234@ email.com>

* Stack splitting now uses right click

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Arkatos <arkatos1234@ email.com>
2021-03-21 01:04:35 +00:00
SkyratBot
9303763ac1 [MIRROR] Warning cone is now craftable (#4127)
* Warning cone is now craftable (#57668)

Co-authored-by: Colovorat <lolqwert569@ gmail.com>

* Warning cone is now craftable

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
Co-authored-by: Colovorat <lolqwert569@ gmail.com>
2021-03-13 14:41:59 +00:00
SkyratBot
51f9b05247 [MIRROR] Standardises Donk Co. stylisation (#3870)
* Standardises Donk Co. stylisation

* Update emags.dm

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-04 21:36:55 +00:00
SkyratBot
e63094d9ae [MIRROR] adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs (#3737)
* adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs (#57263)

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

* adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-01 17:55:55 +00:00
SkyratBot
640cc9744c [MIRROR] [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#3697)
* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#56889)

* crystallizer

* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-02-27 18:55:16 +00:00
SkyratBot
8aee19fce6 [MIRROR] Pens and iron rods can embed again (#3670)
* Pens and iron rods can embed again (#57181)

* Pens and iron rods can embed again

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-26 14:17:03 +00:00
SkyratBot
39fbae46c8 [MIRROR] Updates the stackcrafting description and normal description of the daemon forge (#3671)
* Updates the stackcrafting description and normal description of the daemon forge (#57126)

* Updates the stackcrafting description and normal description of the daemon forge

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-02-26 14:08:39 +00:00