cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-31 20:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,527 Commits 59 Branches 14 Tags
9453da113c0170ca18ed514b356de4dd76df114b
Commit Graph

4316 Commits

Author SHA1 Message Date
Gandalf
0b6fb03562 Batch pr 2 (#12558) 
* https://github.com/tgstation/tgstation/pull/65766

* Update ert.dm

* https://github.com/tgstation/tgstation/pull/65771

* https://github.com/tgstation/tgstation/pull/65868

* Update space_station_13_areas.dm

* https://github.com/tgstation/tgstation/pull/65894

* https://github.com/tgstation/tgstation/pull/65903

* https://github.com/tgstation/tgstation/pull/65908

* https://github.com/tgstation/tgstation/pull/65914

* https://github.com/tgstation/tgstation/pull/65926

* https://github.com/tgstation/tgstation/pull/65930

* https://github.com/tgstation/tgstation/pull/65915

* maps

* icons
 2022-04-06 20:48:02 +01:00
Gandalf
ad0b6e4e67 Batch pr pull (#12554) 
* https://github.com/tgstation/tgstation/pull/65814

* https://github.com/tgstation/tgstation/pull/65832

* https://github.com/tgstation/tgstation/pull/65850

* https://github.com/tgstation/tgstation/pull/65689

* https://github.com/tgstation/tgstation/pull/65579

* https://github.com/tgstation/tgstation/pull/65760
 2022-04-06 19:26:58 +01:00
Zonespace
1118b4175a Adds a bunch of PRs that the Mirror bot missed (#12535) 
* aaAAA

* fix-maps
 2022-04-06 17:50:47 +01:00
SkyratBot
f3bc070303 [MIRROR] COMSIG_ATOM_CREATED -> COMSIG_ATOM_INITIALIZED_ON [MDB IGNORE] (#12444) 
* COMSIG_ATOM_CREATED -> COMSIG_ATOM_INITIALIZED_ON (#65809)

Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>

* COMSIG_ATOM_CREATED -> COMSIG_ATOM_INITIALIZED_ON

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>
 2022-04-01 01:55:31 +01:00
GuiltyNeko
e13ba818e6 Update cargo.dm (#12337) 2022-04-01 01:53:50 +01:00
SkyratBot
cec72761ac [MIRROR] Action button refactor/rework: Enhanced Dragging [MDB IGNORE] (#12423) 
* Action button refactor/rework: Enhanced Dragging

* PHEW

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-04-01 01:38:57 +01:00
Gandalf
575fdb7b12 Upstream merge 65785 (#12450) 
* Fish refactor. (#65785)

Refactors fish into proper paths.
Removes aquarium behaviour intermediary datums.
Moves fish functionality out of aquarium content component.
Fixes flopping animation resetting on dropping.

Simplifies everything. There should be no player facing changes.

The animate signal is kinda weak method of solving the animate queue issue but it seemed least intrusive to me.
Open to any better ideas.

* Fish refactor.

* Update fishing.dm

* Update fishing.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: SkyratBot <skyratcommunity@gmail.com>
 2022-04-01 01:15:20 +01:00
SkyratBot
779af65d8d [MIRROR] Renames some security accesses + misc [MDB IGNORE] (#12348) 
* Renames some security accesses + misc

* fix

* here

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
 2022-03-29 22:29:43 -07:00
SkyratBot
0ddd34d1f5 [MIRROR] Hazardous Area Component | Free Golem Soft-Restriction [MDB IGNORE] (#12345) 
* Hazardous Area Component | Free Golem Soft-Restriction (#65720)

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

* Hazardous Area Component | Free Golem Soft-Restriction

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
 2022-03-28 16:45:32 -07:00
SkyratBot
407c1e9a32 [MIRROR] Mystery boxes no longer cut off each other's audio [MDB IGNORE] (#12306) 
* Mystery boxes no longer cut off each other's audio

* Fixed the merge conflict

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
 2022-03-28 13:34:36 -04:00
Gandalf
e2a68d3b15 Assault Operatives (#12126) 
* Initial commit

* 0

* shuttle and maps

* Equipping

* Minor fixes, gyrojet removed, elite suits removed

* E

* reviews

* Update base_alarm.dm

* nnfghghg

* more fix

* Update dynamic_rulsesets_roundstart.dm

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/vending_machine.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* fyux

* Update assault_operatives_outfits.dm

* E

* Update modular_skyrat/modules/assault_operatives/code/goldeneye.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/interrogator.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/interrogator.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* more review

* E

* uber update

* Update AntagInfoAssaultops.tsx

* Update AntagInfoAssaultops.tsx

* nyooom

* E

* ICARUS SUNBEAM

* fioxes

* Update sunbeam.dm

* Update goldeneye.dm

* Update vending_machine.dm

* Update assault_operatives_outfits.dm

* Update goldeneye.dm

* e

* eee

* Update assault_operatives_outfits.dm

* Update assault_operatives.dm

* Update assault_operatives.dm

* Update goldeneye_cruiser.dmm

* fix

* 0

* haha funneee

* armament system

* more updates

* f

* e

* 0

* e

* more based

* 0

* e

* CQC PLUS CAN SUCK MY COCK

* Update __armament_bodyarmor.dm

* Update assault_operatives.dm

* e

* MG9 balance

* Update armament_utility.dm

* Update sunbeam.dm

* fixes

* Update CentCom_skyrat_z2.dmm

* Update armament_station.dm

* Update modular_skyrat/modules/armaments/code/armament_entries.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/armaments/code/armament_entries.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* e

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update assaultops_armament_station.dm

* reviuew

* Update misc_items.dm

* Update vending_machine.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
 2022-03-28 02:27:25 +00:00
OrionTheFox
b0f9698d69 Removes most sec reskins so that its all one style instead of 3 conflicting ones (#12175) 
* begone, vile palette (redo red scrubs)

* begone, sprite issues! (redo one of the sec-sunglasses)

* begone, unused sprites/items!

* (same as last)

* makes more sense

* no more skirts

* no longer needed

* re-does the security vendor overrides better

* adds old alts of sec gear (for admims/mappers)

* emissives fun!!

* secmed gives me aneurisms

* digi-tize

* commits the cardinal sin

* also fix some palettes while im here

* these are broken anyways

* oops

* Revert "these are broken anyways"

This reverts commit 4941f14b3141e7e78cae1a88908d40a597c3af9d.

* missing icons + reskin fix + adjust fix + blue cap variant

* reskin woes

* i hate medic

* begone, redsec

* iconsss

* Apply suggestions from code review that I did so I can see my changes better

* icon fixes

* removes redundant HoS Formal Suits

* i hate maps

* sec medic kiiinda better

* fix eror

* tgu===

* conflict fix 2

* woo woo woo fix3

* what a silly funny little typo

* red to redsec, easy to search

* fuck you CDO

* i need to stop trying to sprite

* goodbye redsec vendors!!

* one spray of red-away

* bye red! (sprites nyi so not bye yet)

* conflict fix

* few more redsec killings

* what do i even say about this its literally peter griffin

* bye red bye red bye red

* Apply suggestions from code review

* repair icons

* Apply suggestions from code review

* i forgor
 2022-03-27 23:01:49 +01:00
SkyratBot
46d5a1efea [MIRROR] Adds proper sound effects to attacks against flora [MDB IGNORE] (#12305) 
* Adds proper sound effects to attacks against flora (#65508)

* Adds proper sound effects to attacking flora

* Normalises all the sounds to make them as loud as possible and the same volume

* named arguments

* Adds proper sound effects to attacks against flora

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
 2022-03-26 07:40:31 -07:00
SkyratBot
1c9f630649 [MIRROR] DeltaStation's Recreation Area Rework, (LUNG CANCER EDITION) [MDB IGNORE] (#12281) 
* DeltaStation's Recreation Area Rework,  (LUNG CANCER EDITION) (#65588)

* DeltaStation's Recreation Area Rework,  (LUNG CANCER EDITION)

Co-authored-by: san7890 <34697715+san7890@users.noreply.github.com>
 2022-03-26 01:08:18 +00:00
SkyratBot
fa4c25f43b [MIRROR] improves meatspike code, makes it use default buckle [MDB IGNORE] (#12197) 2022-03-21 15:50:16 -07:00
SkyratBot
410014518e [MIRROR] Prevents using invalid materials on airlock assemblies [MDB IGNORE] (#12140) 
* checks if airlock type actually exists (#65494)

* Prevents using invalid materials on airlock assemblies

Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com>
 2022-03-17 08:48:07 -07:00
SkyratBot
45d86dd2c8 [MIRROR] replaces the punching bag sprite, removing fitness.dmi [MDB IGNORE] (#12130) 
* replaces the punching bag sprite, removing fitness.dmi (#65492)

Replaces the punching bag sprite, removing fitness.dmi

* replaces the punching bag sprite, removing fitness.dmi

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
 2022-03-17 00:00:35 +00:00
SkyratBot
58e94861c2 [MIRROR] [MDB IGNORE] 3/4th medkit sprites + firstaid > medkit [MDB IGNORE] (#12034) 
* [MDB IGNORE] 3/4th medkit sprites + firstaid > medkit

* Update storage.dm

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-03-13 22:07:44 +00:00
SkyratBot
f5ff946035 Tramstation Dorm Rework (#11928) 
Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-03-13 21:53:34 +00:00
SkyratBot
04a3d9d617 [MIRROR] New in-wall engine sprites [MDB IGNORE] (#11815) 
* New in-wall engine sprites (#64839)

adds new variants for each sized engine to look like they are in walls (basically cut down sprites with their density set to false (because they dont take up the full tiles, especially the huge engines are 3x3 but only take up 1x3, they must have no density or they block way more than they should))

before: dumb looking gap
image

after: nice clean engine (and box trams are soul filled, also, trams kinda too small to really get any sort of diagnal design working)
image

showcase of each sized thruster:
image

added new structures that act like walls but arent turfs, and can only be used (and can be used!) on trams!
comes with 3 types, iron, plastitanium, and titanium. supports more types being added if you want but these are basically all that a tram needs to use:
Untitled.1.mp4

also removed a duplicated APC in a maint on tram, and removed cycle helpers from random maint airlocks that arent actually meant to cycle (they are solo)
Why It's Good For The Game

engines are kinda too bulky and organically shaped so they dont really fit some designs such as tram as a good example, in wall designs allow you to add thrusters onto any shaped ship easily without worrying about ensuring the walls around them being shaped right, as it appears to have the bulk of the engine merged inside the wall
Changelog

cl Nari Harimoto
imageadd: New thruster sprites to allow for in-wall designs
fix: removed cycle helpers from 2 random tram maint airlocks that arent meant to cycle (solo airlocks) and a duplicated APC in tram maint
expansion: the tram now has new walls! they are structures that function like walls so as to be built on the tram, create and deconstruct via the new tram girder (screwdriver on the girder to deconstruct, there is no displaced version ie wrench)
/cl

* New in-wall engine sprites

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-03-13 21:39:34 +00:00
SkyratBot
17e4f6ad76 [MIRROR] Converts SFX keys into DEFINES [MDB IGNORE] (#11990) 
* Converts SFX keys into DEFINES

* fixes and updates

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
 2022-03-11 16:43:39 -07:00
SkyratBot
6e134aaf32 [MIRROR] New weight machine sprites [MDB IGNORE] (#11985) 
* New weight machine sprites and names (#65335)

imageadd: New sprites for the weight machines.

* New weight machine sprites

Co-authored-by: Tastyfish <crazychris32@gmail.com>
 2022-03-09 23:49:19 -07:00
SkyratBot
80d6870000 [MIRROR] Tool act superpack 2 [MDB IGNORE] (#11947) 
* Tool act superpack 2 (#64428)

About The Pull Request

Continuation of #64375, extracting tool behavior from attackby() and moving it into discrete _act procs. This is about as many files as I had in the last version, as I still want this to be reviewable.

As before, I've tested everything in game and it works as it previously did.
Why It's Good For The Game

The more code moved out of attackby, the more modular things become.
Changelog

cl
refactor: Moves more tool behavior out of attackby().
/cl

* Tool act superpack 2

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-03-07 22:11:04 -07:00
SkyratBot
e80a382570 [MIRROR] Janitorial cart improvements [MDB IGNORE] (#11945) 2022-03-07 15:20:03 -07:00
SkyratBot
e92a995068 [MIRROR] Medical Revamp: Resprites and Jumpsuit/Under Changes [MDB IGNORE] (#11864) 
* Medical Revamp: Resprites and Jumpsuit/Under Changes (#65236)

New sprites for the CMO's turtleneck/skirtleneck, paramedic jumpsuit/jumpskirt, virologist jumpsuit/jumpskirt, and chemist jumpsuit/jumpskirt

* Medical Revamp: Resprites and Jumpsuit/Under Changes

* fix

Co-authored-by: axietheaxolotl <86872535+axietheaxolotl@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
 2022-03-05 14:22:00 -05:00
nevimer
5c7ddf2540 allow you to load your character at the magic mirror (#11721) 
Co-authored-by: nevimer <foxmail@protonmail.com>
 2022-03-04 17:43:26 +00:00
SkyratBot
74b2544a74 [MIRROR] Restores old monkey knockdowns (monkey nerf) [MDB IGNORE] (#11866) 
* Restores old monkey knockdowns (monkey nerf) (#65080)

Monkey knockdown used to be on Crossed until it was made an AI here: 55238

Now it instead uses COMSIG_ATOM_ENTERED, which only takes into account walking over the monkey. Something that you can't do unless you are non-dense or they are lying on the floor, in which case you aren't even knocking them down?
Now it uses COMSIG_MOVABLE_CROSS instead so it's how it used to be, actually functional and useful.

* Restores old monkey knockdowns (monkey nerf)

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
 2022-03-03 18:38:41 -05:00
SkyratBot
4461887970 [MIRROR] Updates all storage bag icons [MDB IGNORE] (#11749) 
* Updates all storage bag icons (#64978)

imageadd: Changes all storage bag sprites

* Updates all storage bag icons

Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
 2022-02-26 02:55:46 -05:00
SkyratBot
02d97ef416 [MIRROR] Change hydroponics tray and chem dispenser AltClick behavior to be used by RMB [MDB IGNORE] (#11700) 
* Change hydroponics tray and chem dispenser AltClick behavior to be used by RMB  (#64939)

* Change hydroponics tray and chem dispenser AltClick behavior to be used by RMB

Co-authored-by: Tim <timothymtorres@gmail.com>
 2022-02-24 06:50:41 -05:00
SkyratBot
8ff60a0e89 [MIRROR] Fixes ratfish harddels, minor code improvements to moisture traps [MDB IGNORE] (#11690) 
* Fixes ratfish harddels, minor code improvements to moisture traps (#65100)

* Fixes ratfish harddels, minor code improvements to moisture traps

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
 2022-02-22 22:08:16 -05:00
SkyratBot
169d007f55 [MIRROR] Fixes being able to create walls out of sheets that arent linked to a material [MDB IGNORE] (#11683) 
* Fixes being able to create walls out of sheets that arent linked to a material (#65063)

* Fixes being able to create walls out of sheets that arent linked to a material

Co-authored-by: SMOSMOSMOSMOSMO <95004236+SmoSmoSmoSmok@users.noreply.github.com>
 2022-02-22 22:06:45 -05:00
SkyratBot
cc4cd24fd6 [MIRROR] Adds Ratfish to moisture traps. [MDB IGNORE] (#11657) 
* Adds Ratfish to moisture traps. (#64888)

* ratfish

* ratfish

* ratfish

* ratfish

* ratfish

* Adds Ratfish to moisture traps.

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
 2022-02-22 12:56:30 +00:00
SkyratBot
7f91ffc23b [MIRROR] Fix chainlink fence doors having incorrect icon/density [MDB IGNORE] (#11640) 
* Fix chainlink fence doors having incorrect icon/density

* Update fence.dm

Co-authored-by: cake xensen <dan@xen.garden>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-02-21 12:42:59 +00:00
SkyratBot
ef9a141145 [MIRROR] Adds some contextual screentips to botany related things [MDB IGNORE] (#11586) 
* Adds some contextual screentips to botany related things (#64954)

* Adds some contextual screentips to botany related things

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
 2022-02-20 06:19:08 -05:00
SkyratBot
c576720516 [MIRROR] Fixes runtimes with the mystery box [MDB IGNORE] (#11582) 
* replaces uses_integrity with just setting a very high integrity (#64873)

* Fixes runtimes with the mystery box

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
 2022-02-18 18:24:48 -05:00
LatteKat
29ba371cef [partially modular] advanced handcuff stuff (#10833) 
* Squashed commit of the following:

commit a3b37c04871a4452d9e4fe31e2926ccf7a245885
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 20 09:52:11 2022 +1100

    argh

commit da4e0d1b70baa81b24b434fd05c230e1dfd1c70d
Merge: 22d5ff8c6b 4ef2012a58
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 20 09:44:01 2022 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 22d5ff8c6bb4698e115d57a57ddb5829d2506647
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 16 22:32:12 2022 +1100

    disallow mixing

commit a82803a3788eaddb00fe053ea03758e81bab0e82
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 16 22:21:50 2022 +1100

    verndor sales

commit 8e674d834f6ec2148924b8ac4d73cb7e75bdb6ec
Merge: 95270b42cc 47ff5b78c5
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 15 15:50:54 2022 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 95270b42cc0c1d347fcd0eeda5d29ae27fca5faf
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 15 15:47:55 2022 +1100

    glow

commit 7faef669fab0a08bbb3916bb470d1f1ce0d6d3ed
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Jan 14 19:47:04 2022 +0300

    kewl emissives

commit b280962fb83d6828e0bfb478c9ef4969c9696d25
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jan 12 19:31:05 2022 +1100

    nooo

commit 704d8716b08b912fe6166ad95e19c32c9b2cc3c4
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jan 12 19:15:56 2022 +1100

    fix

commit 6fd0462ede8d04bd5032d0c207d08765376dead9
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 12:04:32 2022 +1100

    ss

commit 79de967bbd023c7a09a337a8ef6d2197580cd789
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 11:28:38 2022 +1100

    color

commit 89987d9f081554a1d3def9f9fcb002a6d96bb166
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 10:51:01 2022 +1100

    reecalc

commit a6b9cb6440fd04e102dd01e4fc123ef14e2f8ff1
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 10:46:55 2022 +1100

    glow

commit 2ace07e80b3ba19409dee76b98fe657226714638
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 09:48:24 2022 +1100

    layers

commit 6320d7e45cac00fcfff25c9c7ed0f58be1700a63
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 09:45:22 2022 +1100

    messages

commit c1d4b80254782b5a963e35974baebf19f4d3d465
Merge: e646bb97b3 f6c7c3ab85
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 09:42:53 2022 +1100

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit e646bb97b3d84348b1d9c62b149cac10691e4935
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 9 09:42:40 2022 +1100

    rotation

commit f6c7c3ab859c74dede0f6ea3150ac23bfdd5001c
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Jan 8 19:17:27 2022 +0300

    quick fix

commit 1fa94b73bf6bae2c00f7539c19ef065527b8a227
Merge: 823f672efb 46e199be78
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Jan 8 13:23:15 2022 +0300

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit 823f672efb770980770ae47da6c9cd24d3ad82ff
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Jan 8 13:23:12 2022 +0300

    all other taurs

commit 46e199be781bbdf100487d9fde79a945f0d31269
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 8 12:49:01 2022 +1100

    fix

commit a5e669eb06402ebea198abfaf3e49a8ef2e63dcb
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 8 12:38:55 2022 +1100

    remove this

commit 85dec1aa87a785fff03093af51851a05552e0ee9
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 8 12:36:24 2022 +1100

    use it

commit 8a299fddb42c7294da5b8163a3f7db4320ff08b3
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 8 12:30:54 2022 +1100

    fix stuff

commit b121b480d9a50e17d91fe616a3b1a0618cb7fe07
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 8 11:41:03 2022 +1100

    message fix

commit cffd6d8353daa995620e75718b531513fad71b47
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 8 11:25:24 2022 +1100

    minor changes

commit ebce4de13195cadd9f0d02e87b7703edfd9afdf8
Merge: 86feb8e631 9d09b07810
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Jan 7 14:15:55 2022 +0300

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit 86feb8e631ee66b1f4d708d5e96fe4b63ff177f9
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Jan 7 14:15:53 2022 +0300

    test for fullbody

commit 9d09b0781092ec23c1cfd5a8d0d004d850faab20
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jan 7 14:21:05 2022 +1100

    fix digitigrade

commit de040a595a6d793f0df65d4a283bdd9b1d3d0992
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jan 7 13:08:06 2022 +1100

    aaa

commit c182d8fa278804cd3460d3298b3818ac9aa01652
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jan 7 12:48:10 2022 +1100

    move away

commit 5277d33f12e6d80c77f7abd8590e95daea6f8c9b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jan 7 12:42:44 2022 +1100

    slowdown

commit 937cb917f166eca20e2d9722bc43c6a4ef857afc
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jan 7 12:28:22 2022 +1100

    fixes

commit 8bef2ea2ec57c7a683fae28290ec70fc5661587d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jan 7 12:22:26 2022 +1100

    aa

commit e796d0640ab221075c1cf11228168a62b2cc1849
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jan 7 12:21:14 2022 +1100

    fuck

commit 9816212cce04b36b09315dd008a3b8b7d2f4e280
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 19:59:07 2022 +1100

    fix it

commit 5e7b0949c0dee297c816a572d6c76f8c7d45497d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 19:49:35 2022 +1100

    cut these

commit 482b3cbff5535d6625190845e3234e59b0f62393
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 19:46:09 2022 +1100

    icons

commit a59e2ca461a86900e4fd4604e99b4afb12fec37f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 17:30:13 2022 +1100

    fix

commit 8ed19203df94c52148cfb8bab5ab7d2c2bd3dbf8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 12:03:06 2022 +1100

    moar

commit 9bb4adc66acf1f1409f53ab0ea83f76657352359
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 11:59:48 2022 +1100

    oops

commit 6925bacc139222c4c8ebdbe7e3a9b843b13c2a5b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 11:45:19 2022 +1100

    stuffe

commit 1ec03c40c8d1406ffac122dc58b2e7cbf195fd9c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 11:36:39 2022 +1100

    come

commit 23f9f766c6beb1ce089cc7da43c6a98975b257a3
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 11:20:39 2022 +1100

    aaaab

commit 224a07cc863f5f6b1ccb87b9fedea38e20c3ec16
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 11:19:59 2022 +1100

    frick

commit 5c1c2f4336b4d50a9a9c2d8650fc036fe962c92d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 11:11:19 2022 +1100

    some more greyscale stuff

commit 9d8b86ae2ba4010295d37a0d7e3ea7506a217141
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Jan 5 17:45:25 2022 +0300

    shibari stand greyscale stuff

commit 9ae969e4683ccf879d7fe49de81b2ded04ba6228
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Jan 5 17:17:10 2022 +0300

    digi greyscale

commit 8bdda46cf72145fe50f9a44ca072d01bedcc3628
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Jan 5 17:10:48 2022 +0300

    shibari arms done,+ soime tweaks

commit eaac2cd640b3f69fe6c7556bdcf465ebe3478f35
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Jan 5 16:36:36 2022 +0300

    quick fix

commit ba9821d46895693a43ea9cd2d30e322008deae30
Merge: 6dd6225c27 cbfa4f837b
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Jan 5 16:21:26 2022 +0300

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit 6dd6225c27c861c823e2fd5fc13911aaed152376
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Jan 5 16:21:24 2022 +0300

    teshari test file

commit cbfa4f837bd5444b64f962a80defb5373be4191c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 6 00:18:45 2022 +1100

    update

commit 061f1c7a1de3f43c0c420754637eb9a8eb1ed0e5
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Jan 5 15:58:58 2022 +0300

    uniforms for all taurs except teshari

commit cabfad29465228e57c60933fd4b6a9823290e474
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jan 5 12:23:16 2022 +1100

    stand greyscale

commit c1b7e6401f233c90ccab9fcfcf90e9fdefb2c05d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jan 5 11:40:41 2022 +1100

    update

commit f3dad19037cb0783541ed583a52d11a48b530079
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Jan 3 22:45:52 2022 +1100

    some changes

commit b540f4fce38e6d4ee7e616b5ef210a78d4948c56
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Jan 2 15:31:27 2022 +0300

    Shibari stand greyscale test

commit 58fc56b2193f5cae91ff83beddaeda5e1c968610
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Jan 2 15:16:25 2022 +0300

    Greyscale worn test1

commit 773e093fa975b9bbf0679d07d634b69a3fe1076b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 1 18:46:06 2022 +1100

    hm

commit a0e2fc910712753fa0d8c1c4aea162fa77b0da43
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 1 14:07:42 2022 +1100

    initial colorstuff

commit 7e3f8263c51c04588c84e0d641ad67efef179da3
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 1 14:06:24 2022 +1100

    oop

commit 9496f63dcc0fc28c106313e144a72ecc413ec5d8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 1 14:00:48 2022 +1100

    check

commit c8f8792ca91acc215850c78f97ac1de654f54f38
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Jan 1 05:12:36 2022 +0300

    kewl inhands

commit d0f1f228599472deb7ce734edf3512e088ec8834
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Jan 1 04:45:47 2022 +0300

    Grayscale final for icons, i guess

commit 278892fe542b070518ca4f1c086620201b6966fa
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Dec 31 16:25:26 2021 +0300

    greyscale v4

commit 7eef99448cd13adb2a566e40b823356e185d6654
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Dec 31 15:56:51 2021 +0300

    hue shifted variation 3

commit f2e6cbc905ae910ad82ff6306485487db6af397a
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Dec 31 13:22:19 2021 +0300

    hue-shifting-grayscale test2

commit 9532796e8654d6f51f53b2fc7148b8c144cbe9b4
Merge: ae72db005f 64f8a0fb6f
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Dec 31 12:17:48 2021 +0300

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit ae72db005f375bf3ca7ef5310ae036a880e53a4b
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Dec 31 12:17:45 2021 +0300

    Greyscale sprites + icons for stuff

commit 64f8a0fb6f45cb1b9b7e210f4b78c3cd250096cf
Merge: 941235bba2 06239d8d2d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Dec 31 19:54:34 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 941235bba22cf4ded9c52068d80f3288716fc9bb
Merge: 6215950d3e 631bdfa3e7
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Dec 31 08:47:31 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 6215950d3e6fefb172f3fa36ca45e8deaa26b280
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Dec 31 08:47:00 2021 +1100

    stuffo

commit c87abca531fd31dd95890d4edc0a6875fd62e9bf
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Dec 30 19:27:35 2021 +1100

    rigger speedup

commit fad5030671a94230db786f3fd5a15eed4fbc602f
Merge: baafb34cc5 b336830ff8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Dec 30 19:25:14 2021 +1100

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit baafb34cc592120804179d56c61037b4bf375943
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Dec 30 19:25:10 2021 +1100

    warning mesage

commit 9324b5ac06a06242bee895d83cd3e0469ca8f763
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Dec 30 19:21:57 2021 +1100

    grammar

commit acb222bc083dc3773e4dd0ea2aeadb855b36b053
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Dec 30 19:17:52 2021 +1100

    more range check

commit a95a3e8eb59b1dc5962f09954caba5925ead5ee6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Dec 30 19:15:47 2021 +1100

    range check

commit b336830ff876c72b73eb76d77ed441f75c86ffb0
Merge: c5e17ed2c3 04f78ef3f2
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Dec 22 15:46:27 2021 +0300

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit c5e17ed2c33168503d8de868cd7fb54723c72996
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Dec 22 15:46:25 2021 +0300

    Grayscale sprites test

commit 04f78ef3f28c30bdff3b1652693d3a1a745c4744
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Dec 22 14:19:44 2021 +1100

    initial gags port

commit 8fa06fbdcce93f08d584fec576aa88e63cc66a30
Merge: 731fcd678e 547ed4f48f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Dec 22 11:30:14 2021 +1100

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit 731fcd678e9fc8a316db2436746f276e49e81f5f
Merge: 82ef502cb8 a19eb23932
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Dec 22 11:29:40 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 547ed4f48f4f6b145271ba27c32f6c457e6de8ae
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Dec 19 02:32:50 2021 +0300

    Quirks stuff

commit 469cb608794f09261ce7c5d84767dc89e068c6fb
Author: FIRST_NAME LAST_NAME <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Dec 19 01:24:37 2021 +0300

    Some stuff required for merge

commit 82ef502cb8af409d0b35c11d578fb29a1626080b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Dec 7 13:52:18 2021 +1100

    more fixes

commit 3d9b8ca2ee4c0134b5c429f3ea9f2f2480c53962
Merge: 9e08679e04 cdae15cd4e
Author: LatteKat <56778689+jupyterkat@users.noreply.github.com>
Date:   Tue Dec 7 13:34:13 2021 +1100

    Merge branch 'master' into shibari

commit 9e08679e046362e1b2c47ab1cf1572459a70128f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Dec 7 13:23:09 2021 +1100

    fix

commit dcf0029d4c6681e01d86a16389afe0138c4ce059
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Dec 7 09:18:02 2021 +1100

    stuffe

commit 51f2ca7571df619d9b15c92ca3b701f282d58708
Merge: 93cbc3a27a 0bf7e20457
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 24 08:35:07 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 93cbc3a27ad2b5837f9d456afd10f817f6a119e5
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Nov 19 20:32:33 2021 +0300

    Fixed linters, i guess?

commit 96effa93beb8bfacfdd2f723da2d6cf036c922fb
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Nov 19 16:16:36 2021 +0300

    Unfuck you. Love everyone

commit 1ed4a314b8b8e4ba7d3b78d1ae75473678754832
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 17:42:06 2021 +1100

    fuck you

commit 53fe4e19eae86d443b8616015d7ec5ce25b9600c
Merge: 8b63d345b2 7073fd1934
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 17:09:53 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 8b63d345b28b2951f40dea0969d74c1671803451
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 17:09:00 2021 +1100

    not this one

commit 254a3727a3443755070903d148d0a286caceb7a4
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 17:05:11 2021 +1100

    screw off

commit deadb4d356d2e5b504abc1e22865ad2f3d87b39c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 17:01:41 2021 +1100

    doc this dock that suck my ass go figure

commit 8257c01b731f8bb2d816391ffee78826906bdcae
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 16:58:21 2021 +1100

    fuck off

commit 48d98a15eb34ed2f02c678f5062177b3ff221c17
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 12:24:12 2021 +1100

    things

commit 5e718096e2a2e0975ea7e439699ba7f3a47c2fe2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 19 12:20:23 2021 +1100

    shh

commit ba4a63e506293768c4681b0b142fe2881f9dde07
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:59:02 2021 +1100

    mhm

commit e8615c5014a8099c00eeefc2f3b38617bfa7d451
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:47:56 2021 +1100

    no

commit 10fe3a9f5693470882b66a82b987ee0b30eae5e7
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:36:32 2021 +1100

    some

commit 38d234d773a33926a0fbf38518e41f3d2f88ed69
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:35:55 2021 +1100

    message

commit c863ace818e9cffd537dcfcdae7ccd5a6b24dd56
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:33:35 2021 +1100

    prefs

commit 43e628e21f029ce163b249f2c85d5a7ade607175
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:27:47 2021 +1100

    no

commit 579aa272eca659565870ce38b2423c3d85bfef75
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:25:33 2021 +1100

    misc

commit c5d2a43258c06e6a0899aa45ab5cfcb48db333ea
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:14:57 2021 +1100

    doc bullshit

commit 653b651eca01d719d714208d768018bb5c9efa2b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:13:49 2021 +1100

    undo these

commit 0efa85a731a9c7b412f6cd509254927ef230e31f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:12:30 2021 +1100

    you tool

commit 806d51d33bf9fb78684a9e0765040edcf3611511
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:11:42 2021 +1100

    tern

commit f532eb327010bda393b3b11ea9057fa371623a4d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:07:55 2021 +1100

    dotties

commit bb78c9a3481446f987510a9e150580c2d0d0d7e9
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Nov 12 11:04:30 2021 +1100

    shut the fuck up

commit 994bfc07d36895d9e4b3af0f873e419fcf24a3c4
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 10 13:07:22 2021 +1100

    varmeme

commit 3392a68f37cbacab6e4079bee345d7bd2b793bae
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 10 09:52:48 2021 +1100

    ea sports

commit aa9b42eee215880a019da460e04cc1ed888f5a63
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Nov 9 08:56:44 2021 +1100

    n

commit 467f651d2ae3d7ee43f24fb1253f3527f4c7ea10
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Nov 8 08:47:09 2021 +1100

    atoms

commit 42eb3da8d811e17bed7d4c8e5275cd1562785bc2
Merge: 90c71204c9 8081ede720
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Nov 8 08:37:06 2021 +1100

    Merge branch 'master' into shibari

commit 90c71204c9fb442837ef044d26e454a0c23e232b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 3 22:19:46 2021 +1100

    tool sounds

commit 2a27e7e827e9692dd28c369e539afc37588b706a
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 3 22:09:19 2021 +1100

    make it work

commit 5d66cd95fbed61c4c2949cad51f66ef7176b5d07
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 3 21:18:35 2021 +1100

    oops

commit 3a72c035acee3a0b469446f5651b4738098aac02
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 3 21:14:54 2021 +1100

    messages

commit 198e9828b24b88db57cdb804f26377fce3ffab2e
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Tue Nov 2 17:43:33 2021 +0300

    oll

commit ec11b2b159bc463f53e7b6a98de8777760ca4ec5
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Oct 30 11:19:56 2021 +1100

    mehm

commit 5536edf152469b716acc229112386e5343a5b9c0
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Oct 30 11:18:07 2021 +1100

    messages

commit eb7efce204b2837a2a67a1495b93742418eccd33
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Oct 30 11:13:22 2021 +1100

    some more shibari

commit 62df116a420dac93a504c05e08760307de889814
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 27 09:31:31 2021 +1100

    white

commit 312fc3b4b62250ff89e0e54af177b4cfaf220e79
Merge: 57fd287af8 7da9f2dbac
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Oct 27 01:26:08 2021 +0300

    Merge branch 'shibari' of https://github.com/lamella-0587/skyrat-tg into shibari

commit 57fd287af83930d28cc6c11a864ead5d970d6240
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Wed Oct 27 01:26:05 2021 +0300

    haha colours

commit 7da9f2dbace372cff2354c51dddfe4da20e1e436
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 27 08:57:22 2021 +1100

    abx

commit b7263a04c63927e54ea304f95f3571eef22ed9c7
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 27 08:43:46 2021 +1100

    funke

commit 86ee3c578c8337fee618240092a250575a5d239b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 27 08:41:53 2021 +1100

    ea

commit 63987da36f1056e34de554b2659376f9ad2c03f1
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Oct 25 16:45:27 2021 +0300

    Snake? Snake! SNAAAAAAKE!!

commit 8c1a461517417adce4a0c56fbcf313b1aa52747c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Oct 25 09:14:33 2021 +1100

    fuck

commit 914a025f8d52c91a1143ea57da2295f7d8348cc8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Oct 25 09:13:32 2021 +1100

    ab

commit 7446a04be0a1d6be4b17b8200facb00878ac151f
Merge: 214e7d0b87 df05822b49
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Oct 25 08:23:58 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 214e7d0b87ebf6e99758bf75537f02799f78c06c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 20 07:39:17 2021 +1100

    weh

commit b812207d74f17712ff406338826de2d5bb78b944
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Oct 19 12:17:31 2021 +1100

    mhm

commit e714b91e5d111dceca444e88948c09281cea41c2
Merge: b0dfc8716b d6b94015e5
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Oct 19 12:16:52 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit b0dfc8716b57206c56e7a2af3d08ba5cfda7c2e4
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Oct 15 12:32:30 2021 +1100

    bleh

commit fed4eb6c05f0fe8e4a2b4c1b351b98a51c7d8693
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Oct 15 12:29:41 2021 +1100

    fixes

commit 420a888921bc2aeafdee16665797c0bfda1d30d9
Merge: 08647e2356 a160d6a449
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 13 18:14:21 2021 +1100

    Merge remote-tracking branch 'upstream/master' into shibari

commit 08647e235678f89b6bbc31fdd58e79797017a0c9
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Oct 11 20:32:04 2021 +0300

    clean up this

commit 9e41a5e19e4f526e5f960a6946dd655d1dd1b6be
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Oct 7 03:13:24 2021 +0300

    visual bug fixed, added new stand color

commit 641a7e5983b68d52581411f28d76666380402827
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Oct 7 02:52:25 2021 +0300

    fug, forgot these

commit c64a008a931f10e3aa51155c7c27084c30399622
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Oct 7 02:38:18 2021 +0300

    icons for taurs

commit bac8146ae20f5a08b5b7c026c658731581dd5a1d
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Oct 3 23:56:30 2021 +0300

    shoes shibari icons

commit 6463cbfbad891d684507d71d18c2197179b357ef
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Sep 29 18:58:53 2021 +1000

    shiez

commit 616163e137104e0d261dc3b0007bab5dced77a19
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Sep 29 18:10:28 2021 +1000

    FUCK

commit 4168178a411300e361a98cbbd66f0663544b4d1e
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Mon Sep 27 23:45:37 2021 +0700

    Delete living latex stuff from shibari branch

    Transfered to living_latex branch

commit 8838ef51eb534ceaca2587c2bc1a59ccd9246b54
Merge: 998c671896 ac103f2eb9
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Mon Sep 27 22:54:18 2021 +0700

    Merge branch 'master' into shibari

commit 998c671896b169a98c9ac488b72e44dcf4306701
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 23 20:46:07 2021 +0300

    gloves icons

commit 5b3771bb6ae741ae9943fcb863d03612a7efd1b8
Merge: b691fa2505 e29db64514
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 23 12:39:22 2021 +1000

    Merge remote-tracking branch 'upstream/master' into shibari

commit b691fa2505a983c81bb32542a9f769b3d9225417
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 23 04:01:05 2021 +0300

    ropes in progress

commit 7b32031dcfb52e764b298419222ce260fbe97a7c
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 23 02:54:55 2021 +0300

    cool icons

commit 19ff16930625c9037254220d58d50f8ee6f08e6f
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Sep 20 18:25:03 2021 +0300

    Lol, catsuit counted as animation. Just noticed

commit 9d6b318e835d717bce14eb7d2d28a3113fdf3117
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Sep 19 19:42:09 2021 +0300

    i fixed two pixels so i made a new commit. Fuck me

commit b0c68124072d9e478cc68b29e62ac74810f99ef2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Sep 19 19:32:24 2021 +1000

    shibari stand initial

commit 70fa47db5c13bab184cbb40faf32bfe9ae334e96
Merge: 7f4bff5256 51d33ddd80
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Sep 19 19:19:59 2021 +1000

    Merge remote-tracking branch 'upstream/master' into shibari

commit 7f4bff525637d6c0310f8af739de3626c9bb03ed
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Sep 18 23:31:18 2021 +0300

    latex coating animation

commit 16343ea341bc383c6cfce4cad9019fdc8b0edaff
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 18 10:18:18 2021 +0700

    hot fix

    - Fixed errors with links in the dme file
    - Fixed unfinished refactoring in ballgag.dm

commit bf244abc6f35b4b713ea19b4883411ecb9012aeb
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 16 13:21:51 2021 +0300

    iconssss

commit 126377a74ee692149dff260413d91a67420e7bf3
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 16 13:10:23 2021 +0300

    quick icons

commit 6a1231406b8bac8996bf232a5ea249a8df70c71d
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 16 13:08:21 2021 +0300

    fuck you, i removed these items because they are copying new ones. And i will do it again and again. THIS IS WAR!!!

commit 89c748e844f86d89e8268b8b6e6dc4e6664eb320
Merge: 18ce3a6aa0 cac0e470c4
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 16 13:07:35 2021 +0300

    Merge branch 'shibari' of https://github.com/lamella-0587/skyrat-tg into shibari

commit 18ce3a6aa060823e8238139a7671ec01e759c77b
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 16 12:58:41 2021 +0300

    stuff

commit cac0e470c4a1f9b89b1817efeca1728667699e2a
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Tue Sep 14 10:06:48 2021 +0700

    Update living_latex_sprayer.dm

    Things is renamed
    Add links to dmi files for items

commit 94b9809976bd7a5cf9a4cbb0376d111b717cff2b
Merge: 9ed3f73b91 d76d72494e
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Tue Sep 14 10:05:02 2021 +0700

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit 9ed3f73b91d8dfb3ab6f75d005230d9b31a4aeda
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Sep 13 16:01:36 2021 +0300

    encoder sprite finished

commit fe43ab0df0f8cc1e32de9f59938bd5d68de053b9
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 19:05:23 2021 +0700

    Update living_latex_sprayer.dm

    .

commit 617fb1497bad4a4622a88a26c80db23982ea77c8
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 14:19:17 2021 +0700

    Update livinglatex.dm

    Improved classes and inheritance.

commit a538fab46b19fccd386ede03cb2477b8f99e4c0f
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 11:52:38 2021 +0700

    create livinglatex.dm for clothes

    Added blank file for living latex clothes.

commit 1091d0f610bb32cfa44d0e1f01303e0862e07ffc
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 22:41:14 2021 +0700

    Update living_latex_sprayer.dm

    Forgot the code for installing the chip in the slot and removing the canister

commit 5fabb10f397216b3b60612dbd0c62a3ac1f1a83e
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 14:19:27 2021 +0700

    Update living_latex_sprayer.dm

    Translate comments to english.
    A few text quick fixes and additions.

commit d049efd4771ab66d67bc37b9d27979bedf57aba5
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 13:10:47 2021 +0700

    Update living_latex_sprayer.dm

    Added code for:
    -Open and close the chip slot
    -Insert and remove the chip from the slot
    -Ability to take out and insert the canister
    -Added a number of stubs for unnecessary functions

commit f2ae697c424d8c3db0da3d61b0e04d521ebaeb74
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 00:02:43 2021 +0700

    Create living_latex_sprayer.dm

    Living latex sprayer. Blank.
    The basis for filling with images, sounds and descriptions.
    The main mechanics of shooting and impact effects are not implemented.

commit 3b683c6f2c40425ae35ade597943678ffd01ec14
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:07:53 2021 +1000

    fuck

commit 46193bbbee95e25115e2d82da6b9b0c2d37046c7
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:05:10 2021 +1000

    replacing

commit 7b8dd4376daf85ff2d81d1ed402353221b238444
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 13:24:48 2021 +1000

    fixes shibari

commit fe779763a530d218bdadc23664984df965b1aade
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 2 01:42:09 2021 +0300

    stuff for shibari and fixes of dumb mistakes

commit d6d30d9cff5b78e3378e77b8da29ed8ca90d64b7
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Aug 21 00:14:04 2021 +0300

    legs and arms shibari done. Rope itself on the way

commit 1aefe4234a7564358824355282e46d8d4f764e27
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Aug 20 03:43:28 2021 +0300

    added shibari fullbody, body and groin bondage worn items.

commit 83745e54227e53aea902488ca4b254f7255ce78f
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 16:36:04 2021 +0300

    examine stuff

commit 82149796c66e4ea4309c57b73cd5bd8caf849e9e
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 04:45:10 2021 +0300

    patch 1.01 - restock, random skin and half of examine code.

commit 2cf1471c1d00636bdc2d29ce1dc1920a5cfcc688
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Mon Sep 13 15:44:37 2021 +0700

    few upd to living latex

    save progress...
    few build fail fixes.
    add sprayer to dme

commit 133a7fe76b2021dab8774fd881807eb8f36bbcf8
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 19:05:23 2021 +0700

    Update living_latex_sprayer.dm

    .

commit 9549f3d687349982963ac8b1569e9be6c7a2eba7
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 14:19:17 2021 +0700

    Update livinglatex.dm

    Improved classes and inheritance.

commit 980271486ea4eb99e0248e25a1cadc9cdf252d9f
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 11:52:38 2021 +0700

    create livinglatex.dm for clothes

    Added blank file for living latex clothes.

commit d684e079fc6f2f595bfc45c5572302fb724c2b64
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 22:41:14 2021 +0700

    Update living_latex_sprayer.dm

    Forgot the code for installing the chip in the slot and removing the canister

commit e80deea5f7737ea79c260846f953f3d08fceb9b7
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 14:19:27 2021 +0700

    Update living_latex_sprayer.dm

    Translate comments to english.
    A few text quick fixes and additions.

commit 9302ceecf36e6881cb9dcb78d83a2cb72f0c8eb9
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 13:10:47 2021 +0700

    Update living_latex_sprayer.dm

    Added code for:
    -Open and close the chip slot
    -Insert and remove the chip from the slot
    -Ability to take out and insert the canister
    -Added a number of stubs for unnecessary functions

commit f4d953fdde03679abb49d488ffa1d7e4e9a20d2f
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 00:02:43 2021 +0700

    Create living_latex_sprayer.dm

    Living latex sprayer. Blank.
    The basis for filling with images, sounds and descriptions.
    The main mechanics of shooting and impact effects are not implemented.

commit c9b9f4edae0b988d199d89fb04ad3d5b4035c6fa
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Sep 13 11:59:09 2021 +0300

    kubic request

commit 5145a16e975fd8163877129381d53906c898b630
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Tue Sep 7 20:14:03 2021 +0300

    Sprite stuff

commit 5d8aa809dc75b47b908c073a27418b9aac1b7d3c
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Sep 3 14:52:00 2021 +0300

    icons bugfix

commit 36aba151f96b35d9079565e6a430d46afd9f6783
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:07:53 2021 +1000

    fuck

commit 3f8f1af850011a70d74c5f98666fd378dc99f7a6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:05:10 2021 +1000

    replacing

commit f4a612ed71ed36631d4118cb1f9834a61461066b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 13:24:48 2021 +1000

    fixes shibari

commit 1fa65f1c3926faa5e5ed2335bc378d8b6b2b7114
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 2 01:42:09 2021 +0300

    stuff for shibari and fixes of dumb mistakes

commit 2010169bbf992417c1597208df42525041a108f2
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Aug 21 00:14:04 2021 +0300

    legs and arms shibari done. Rope itself on the way

commit 4ed05ba91ffee4466e62eaa6936df227bfaeb726
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Aug 20 03:43:28 2021 +0300

    added shibari fullbody, body and groin bondage worn items.

commit af1e9db79c337c18039d7adfa8209d0821ef2c29
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 16:36:04 2021 +0300

    examine stuff

commit 6bb38600b75030af1fe7b6249e7ed21a77ad5fb3
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 04:45:10 2021 +0300

    patch 1.01 - restock, random skin and half of examine code.

commit d76d72494e42466132d0b06468bb3cbdd550237f
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Tue Sep 14 01:06:50 2021 +0300

    kekwl

commit bfa123689498d188745d791f8528bef0b440ec49
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Sep 13 16:01:36 2021 +0300

    encoder sprite finished

commit 2aa5eda64bb160786c83f50effeda2ca9dc733c4
Merge: 515798eeaf aef1a54adb
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Sep 13 12:21:58 2021 +0300

    Merge branch 'shibari' of https://github.com/lamella-0587/skyrat-tg into shibari

commit aef1a54adb09a52d2180a6a3e75d38890414b5a5
Merge: 780ade7490 ede31f1426
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Mon Sep 13 16:18:05 2021 +0700

    Merge branch 'shibari' of https://github.com/Lamella-0587/Skyrat-tg into shibari

commit 515798eeaf45c94caf974963104f573962e524a4
Merge: 0163bbb0f2 ede31f1426
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Sep 13 12:17:45 2021 +0300

    Merge branch 'shibari' of https://github.com/lamella-0587/skyrat-tg into shibari

commit 0163bbb0f2a2fc1ce30902aef430b677aafb268f
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Mon Sep 13 11:59:09 2021 +0300

    kubic request

commit 780ade7490c68f95ddc19a3da9dc8e20bd4921b8
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 19:05:23 2021 +0700

    Update living_latex_sprayer.dm

    .

commit 09b5a704a43b55429e695d1759d5ecdedf2843e7
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 14:19:17 2021 +0700

    Update livinglatex.dm

    Improved classes and inheritance.

commit d01975a66346d1d5edd6c3c1c30fd0c535e996ec
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 11:52:38 2021 +0700

    create livinglatex.dm for clothes

    Added blank file for living latex clothes.

commit 12effaaf1b13a01c7618c3b6cad6a32f243f83af
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 22:41:14 2021 +0700

    Update living_latex_sprayer.dm

    Forgot the code for installing the chip in the slot and removing the canister

commit a28faee066c45773793ceed171d87bd908e901a6
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 14:19:27 2021 +0700

    Update living_latex_sprayer.dm

    Translate comments to english.
    A few text quick fixes and additions.

commit cca09f2cad006eea350c5397f5b88694ed420498
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 13:10:47 2021 +0700

    Update living_latex_sprayer.dm

    Added code for:
    -Open and close the chip slot
    -Insert and remove the chip from the slot
    -Ability to take out and insert the canister
    -Added a number of stubs for unnecessary functions

commit d7a2197cee02ebb09483a0654d4b17c2a508fa89
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 00:02:43 2021 +0700

    Create living_latex_sprayer.dm

    Living latex sprayer. Blank.
    The basis for filling with images, sounds and descriptions.
    The main mechanics of shooting and impact effects are not implemented.

commit 5784b4076a79b9438697b3ca5de3431add991847
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Tue Sep 7 20:14:03 2021 +0300

    Sprite stuff

commit f440c5c21805c08b76c9c9ca825a8052aeee9295
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Sep 3 14:52:00 2021 +0300

    icons bugfix

commit 3f2f7b91dd218fe0d74256b0f1e8f7238d405542
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:07:53 2021 +1000

    fuck

commit e4b0384af6987bd84b642017876f2201e2d015a8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:05:10 2021 +1000

    replacing

commit 0bae9f84ae87a4c0085828e19925c85119cf8d9c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 13:24:48 2021 +1000

    fixes shibari

commit c2414f1675f6893dfba7a3d6fec41ea5fd924f71
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 2 01:42:09 2021 +0300

    stuff for shibari and fixes of dumb mistakes

commit 3ac8157e6b9939e0fdda628949952a8aa5637efd
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Aug 21 00:14:04 2021 +0300

    legs and arms shibari done. Rope itself on the way

commit 5f370d154afce5b00118bf5bc11844ded3b9c02f
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Aug 20 03:43:28 2021 +0300

    added shibari fullbody, body and groin bondage worn items.

commit 39f898c0f9d3c34a33559d8732d97689a9756945
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 16:36:04 2021 +0300

    examine stuff

commit 6de6d60a85b903efe2612be7bbbb99404a9696cd
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 04:45:10 2021 +0300

    patch 1.01 - restock, random skin and half of examine code.

commit ede31f14260cffc8dc5de41848f04982a5e75b52
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Mon Sep 13 15:44:37 2021 +0700

    few upd to living latex

    save progress...
    few build fail fixes.
    add sprayer to dme

commit 31efb0e81332027a4a0aecf269f2f5e6bf9029b5
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 19:05:23 2021 +0700

    Update living_latex_sprayer.dm

    .

commit a56a5c072651b4f71fed0d87a9f22cfa12e2796b
Merge: c4540eba1a f81cc2775b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Sep 12 19:16:38 2021 +1000

    Merge remote-tracking branch 'upstream/master' into shibari

commit c4540eba1a7aeff65a159c16b702c811b150c5f0
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 14:19:17 2021 +0700

    Update livinglatex.dm

    Improved classes and inheritance.

commit e1029fe86f90163ec7620b69fa062d76f09711ea
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sun Sep 12 11:52:38 2021 +0700

    create livinglatex.dm for clothes

    Added blank file for living latex clothes.

commit 6e1f1b01fb423281d9500e244121c3dbd0b089b2
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 22:41:14 2021 +0700

    Update living_latex_sprayer.dm

    Forgot the code for installing the chip in the slot and removing the canister

commit 7424a0942ff829b42c440147e27bab506fe6a952
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 14:19:27 2021 +0700

    Update living_latex_sprayer.dm

    Translate comments to english.
    A few text quick fixes and additions.

commit 1b9388c5c9523f537172eb18a6d8135b174804ff
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 13:10:47 2021 +0700

    Update living_latex_sprayer.dm

    Added code for:
    -Open and close the chip slot
    -Insert and remove the chip from the slot
    -Ability to take out and insert the canister
    -Added a number of stubs for unnecessary functions

commit f934c0659c6403a103ec3b589bba192e2681ad7a
Author: GemInee <33014703+GemInee@users.noreply.github.com>
Date:   Sat Sep 11 00:02:43 2021 +0700

    Create living_latex_sprayer.dm

    Living latex sprayer. Blank.
    The basis for filling with images, sounds and descriptions.
    The main mechanics of shooting and impact effects are not implemented.

commit 8870c3be15f6b209f98b4b1c0eefb6d2492b2f36
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Tue Sep 7 20:14:03 2021 +0300

    Sprite stuff

commit c0051bd264f8d5f9ec2493c4c7a1eb46a22d4178
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Sep 3 14:52:00 2021 +0300

    icons bugfix

commit 691fa63ca80b9dd3f4314dc578b7f2a255bc977c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:07:53 2021 +1000

    fuck

commit 01e1029d24a45b020d3ede15f94171aacb7ad6e6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 21:05:10 2021 +1000

    replacing

commit 19e050697bdee61f05dfff8c60f25ed6e1232e4b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Sep 2 13:24:48 2021 +1000

    fixes shibari

commit e50c5b619380da6c7013a19a4de281e4cb8b38ac
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Thu Sep 2 01:42:09 2021 +0300

    stuff for shibari and fixes of dumb mistakes

commit a0546f14a0d7ce70e21b075a8e4ce38f1baff352
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sat Aug 21 00:14:04 2021 +0300

    legs and arms shibari done. Rope itself on the way

commit 07ca05f3b3b01be2d22069c782da16c6cd786593
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Fri Aug 20 03:43:28 2021 +0300

    added shibari fullbody, body and groin bondage worn items.

commit fd3b829d5bde7256a4712b89325e366ea769b360
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 16:36:04 2021 +0300

    examine stuff

commit f1808aa1e6dc2479606a67feaab1e46468c3faf1
Author: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
Date:   Sun Aug 15 04:45:10 2021 +0300

    patch 1.01 - restock, random skin and half of examine code.

* desc

* funke

* changes

* bloons

* uhh no

* stuffo

* undo vendor changes

* stuff

* undo this

* fix name

* do_mob

* some shits

* ab

* aab

* oops

* fix runtime

* not necessary

* typod

* file separation

* argh

* mhmmm

* return it

* taur
 2022-02-16 17:34:00 +00:00
SkyratBot
d1cfb4338e [MIRROR] Contextual screentips -- Screentips now show you what items/objects can do [MDB IGNORE] (#11529) 
* Contextual screentips -- Screentips now show you what items/objects can do (#64502)

Adds the foundational system for contextual screentips, which will show you what you can do with objects/items, including through context, such as what you are holding.

Provides several helper elements for most use cases, and applies it to a handful of common objects in order to show the full breadth of the system.

Changes screentips preference from on/off to on/off/only with context. Players who originally had it on off will have it migrated to only with context, though can re-disable it.

* Contextual screentips -- Screentips now show you what items/objects can do

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
 2022-02-15 23:48:07 +00:00
SkyratBot
57cc1ca65f [MIRROR] Gives Omega soap 800 uses instead of 301 [MDB IGNORE] (#11444) 
* Gives Omega soap 800 uses instead of 301

* Fixing dem conflicts yo

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
 2022-02-11 14:59:35 +00:00
SkyratBot
b2cc74a77e [MIRROR] Fixes layering issues brought by the FoV PR. [MDB IGNORE] (#11411) 
* Fixes layering issues brought by the FoV PR.

* Update code/__DEFINES/layers.dm

* Update code/modules/mob/living/living_defines.dm

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
 2022-02-10 02:51:52 +00:00
SkyratBot
2412b79b0a [MIRROR] Wrench interactions with closets migrated to wrench_act_secondary [MDB IGNORE] (#11386) 
* Wrench interactions with closets migrated to wrench_act_secondary (#64724)

Backend cleanup of the code involving anchoring and unanchoring lockers.
Moved feedback to balloon alerts as well.

* Wrench interactions with closets migrated to wrench_act_secondary

Co-authored-by: Cameron! <cameronwoof@live.com>
 2022-02-08 21:41:13 +00:00
SkyratBot
ccb0aaea1a [MIRROR] Ballistic to Energy: Autorifles for Thermal Pistols; Adds .38 Crate to Cargo [MDB IGNORE] (#11340) 
* Ballistic to Energy: Autorifles for Thermal Pistols; Adds .38 Crate to Cargo

* eeee

* Update new_player.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-02-08 01:59:42 +00:00
SkyratBot
cd814c127f [MIRROR] Adds an option to generate typecaches as zebras. [MDB IGNORE] (#11330) 
* Adds an option to generate typecaches as zebras.

* Update energy_ball.dm

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-02-08 01:54:04 +00:00
SkyratBot
d682fbfbc8 [MIRROR] Rotation component refactor and improvements [MDB IGNORE] (#11304) 
* Rotation component refactor and improvements

* Update code/modules/power/singularity/emitter.dm

* e

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2022-02-08 01:38:20 +00:00
SkyratBot
b45221cfa1 [MIRROR] Tgui input refresh [MDB IGNORE] (#11290) 
* Tgui input refresh

* Update code/modules/mob/dead/observer/observer.dm

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
 2022-02-06 23:08:19 -05:00
SkyratBot
07c88ffb0a [MIRROR] Add new surgery tgui that provides a built in body zone selector and doesn't let you start surgeries if their body is covered. Replaces some stuff with balloon alerts [MDB IGNORE] (#11322) 
* Add new surgery tgui (#64579)

* Move element to component, start UI, move assets into their own directory

* Complete UI

* Stop when another surgery is started

* Set your real zone since I forgot you actually need to start the surgery too

* Bring this back since I was just removing it as part of a cleanup for asset cache, but I can't prove it's not used anymore

* Remove unnecessary constructor I was using for something else

* Fix signal override

* Add new surgery tgui that provides a built in body zone selector and doesn't let you start surgeries if their body is covered. Replaces some stuff with balloon alerts

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
 2022-02-06 20:37:56 +00:00
SkyratBot
a8c1ffba40 [MIRROR] xeno egg now updates its icon properly when burst [MDB IGNORE] (#11305) 
* xeno egg now updates its icon properly when burst (#64648)

* xeno egg now updates its icon properly when burst

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
 2022-02-06 13:51:40 +00:00
SkyratBot
1a63adde16 [MIRROR] Adds the mystery box [MDB IGNORE] (#11228) 
* Adds the mystery box

* Adds the mystery box

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
 2022-02-02 17:39:30 +00:00
SkyratBot
8a6a71ffeb [MIRROR] Fixing a number of issues with burial mounds and abandoned crates. [MDB IGNORE] (#11197) 
* Fixing a number of issues with burial mounds and abandoned crates. (#64482)

Ok, I'm fixing a few issues with certain crates, namely the abandoned one and the burial mound:

    An oversight with the skittish trait letting players dive into burial mounds, which are technically a subtype of crates.
    A runtime that made abandoned crates not update their lock lights when unlocked (the togglelock call was missing the user arg). This one was my fault.
    An oversight with abandoned crates not resetting the number of attempts left and not nulling the last attempted code when re-locked. Idem.
    Burial mounds somehow getting lock lights overlays.

Also i'm taking this opportunity to make the closets unit test not early return at the first encountered failure (at the time I made it I didn't know TEST_ASSERT & co would early return on failure) since we want this unit test to finish looping through all non-blacklisted closets.

* Fixing a number of issues with burial mounds and abandoned crates.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2022-01-31 23:24:04 -05:00
SkyratBot
da527e22cd [MIRROR] Refactor incapacitated optional arguments [MDB IGNORE] (#11167) 
* Refactor incapacitated optional arguments

* Refactor incapacitated optional arguments

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
 2022-01-31 11:29:36 +00:00
SkyratBot
61031399b3 [MIRROR] xeno weed changes [MDB IGNORE] (#11171) 
* xeno weed changes (#64477)

lowered the grow time limit from 15-20 seconds to 5-10 seconds
weeds can't grow in water now
documented the variables and procs
use the cooldown system
children weeds of the parent node will be destroyed on parent destroyed

* xeno weed changes

Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
 2022-01-31 04:24:10 -05:00