Commit Graph

542 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
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
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
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
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
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
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
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
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
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
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
OrionTheFox
fa73f9cdab Adds Loincloths (#3499)
* Add Loincloths

Adds leather and cloth loincloths, craftable with their namesake materials; also adds a sensor variant in the Autodrobe and Loadout.

* what the fuck

oh no its broken

* feck

changes defines to be correct, fixes female sprites borking, lets you fix your wedgie, and adds cloth crafting. basically fixes everything.
2021-02-20 22:00:19 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
e33adb614d [MIRROR] Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles. (#3262)
* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles. (#56696)

* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2021-02-10 11:55:12 +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
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
SkyratBot
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

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

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
SkyratBot
732f917bd2 [MIRROR] New emergency storage sprites (#3076)
* Unique sprites for emergency o2 tank boxes (#56624)

* New emergency storage sprites

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-02-04 21:19:58 +00:00
SkyratBot
f18f2ad02f [MIRROR] Pipeguns: Elitism Edition (#3054)
* Pipeguns: Elitism Edition

* fixes

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 16:25:10 +00:00
SkyratBot
d46cde8eae [MIRROR] Adds the Hauntium material, which turns any item into a ghost (with AI) (#2918)
* Adds the Hauntium material, which turns any item into a ghost (with AI) (#55728)

* Adds the Hauntium material, which turns any item into a ghost (with AI)

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-01-28 03:06:55 +01:00
SkyratBot
94f9a384b0 [MIRROR] [READY] Bespoke Datum Mats (#2737)
* [READY] Bespoke Datum Mats

* Update sheetifier.dm

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-17 13:25:04 +01:00
SkyratBot
7361de863c [MIRROR] Refactor caltrop component into element (#2651)
* Refactor caltrop component into element

* Delete caltrop.dm

* Update caltrop.dm

Co-authored-by: coiax <jack@billbuddy.co.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-12 02:06:53 +01:00
SkyratBot
f79e91462c [MIRROR] LINDA Reforged (#2573)
* LINDA Reforged

* Update airlock.dm

* Update biohazard_blob_controller.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-08 18:52:35 +01:00
Azarak
7a6c5eefa2 Removes meat and pizza materials (#2540) 2021-01-07 21:05:57 +01:00
SkyratBot
d7f054b035 [MIRROR] Refactors monkeys into a species (#2379)
* Refactors monkeys into a species

* aaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-31 21:08:07 +01:00
SkyratBot
94ed7ed0f1 [MIRROR] Refactors how movetypes are added and removed, No timers this time. (#2358)
* Refactors how movetypes are added and removed, No timers this time. (#55444)

* Refactors how movetypes are added and removed, No timers this time.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-12-29 02:39:03 +00:00
SkyratBot
45a4ffc3f9 [MIRROR] Fix grammar of smashing sheets of glass (#2344)
* Fix grammar of smashing sheets of glass (#55737)

The message was missing the indefinite article, meaning you would "leave
shard", rather than "leaving a shard".

* Fix grammar of smashing sheets of glass

Co-authored-by: coiax <yellowbounder@gmail.com>
2020-12-27 23:35:18 +00:00
Azarak
6b399baf30 Adds constructable sauna ovens. Hot and steamy (#2242)
* aaa

* oops

* very good catch mr lint

* Update sauna_oven.dm
2020-12-19 15:30:57 +00:00
SkyratBot
66c207e19c [MIRROR] Reverts (#54963) due to timer spam (#2109)
* Revert "Refactors how movetype flags are added and removed and the floating animation (#54963)" (#55432)

This reverts commit b8425c003a.

* Reverts (#54963) due to timer spam

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-12-10 05:58:05 +01:00
SkyratBot
2ee5d422ae [MIRROR] Refactors how movetype flags are added and removed and the floating animation (#2096)
* Refactors how movetype flags are added and removed and the floating animation (#54963)

I wanted to refactor how movetype flags are added and removed into traits to prevent multiple sources of specific movement types from conflicting one other. I ended up also having to refactor the floating animation loop (the one that bobs up and down) code in the process.
Why It's Good For The Game

A way to avoid conflict from multiple sources of movement types.
This also stops melee attacks, jitteriness and update_transform() from temporarily disabling the floating movetype bitflag altogether until the next life tick.

Tested, but i'm pretty sure improvements could be made.
Changelog

cl
fix: jitteriness, melee attack animations and resting/standing up should no longer momentarily remove the floating movement type.
/cl

* Refactors how movetype flags are added and removed and the floating animation

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-12-09 23:43:42 +01:00
SkyratBot
3a0491d3b4 [MIRROR] Small do-after refactor (#2074)
* Small do-after refactor (#55172)

This is an alternative to the PR Ryll made, it does some things similar e.g. the default limit of 1 interaction per target for a person, however, it refactors do_afters to support overrides for max interaction counts and unique sources.

For example, stripping uses the item being stripped as the source, allowing you to strip multiple items, but not the same item multiple times.

I've also fixed most other edge-cases this could cause where balance would be affected, but feel free to point out any I might've missed, this'll probably require some longer-term testmerging.

* Small do-after refactor

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-12-07 22:46:59 +01:00