Commit Graph

1439 Commits

Author SHA1 Message Date
SkyratBot
4dcc055fef [MIRROR] Fixing parallax plane above blackness [MDB IGNORE] (#9683)
* Fixing parallax plane above blackness  (#62902)

* merge

* Update plane_master.dm

* What Iam doing

* Fixing parallax plane above blackness

Co-authored-by: KIBORG04 <bossmira4@gmail.com>
2021-11-24 11:15:31 -05:00
SkyratBot
774dbda401 [MIRROR] Instant cameras can now be used as circuit shells. [MDB IGNORE] (#9661)
* Instant cameras can now be used as circuit shells. (#62810)

A circuit and shell components have been given to instant cameras around the station, so they can now be used for wiremod. There's no new wiremod design here since they can already be printed at any autolathe.
@ Watermelon914 also told me a while ago that items should be given the shell component and not the usb port one.
Outside of the sci department and more specifically the protolathe and component printer, there's currently a lack of objects that can be used as circuit shells, which means wiremod is more or less limited to its own printables and the less versatile, higher end usb ports around the station. This is a small step toward a more inclusive wiremod that can use station devices for circuits building.

* Instant cameras can now be used as circuit shells.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-23 12:43:59 -05:00
SkyratBot
ea65511447 [MIRROR] Add disabling footstep sounds and parallax to the lag switch panel [MDB IGNORE] (#9645)
* Add disabling footstep sounds and parallax to the lag switch panel (#62999)

At the last Toolbox Tournament, @ MrStonedOne pointed out some big performance consumers. Some are disablable through easy means, but others were not. This adds two easy ones to the mix.

* Add disabling footstep sounds and parallax to the lag switch panel

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-11-23 08:44:29 -05:00
Tom
6a4537fa4e de-capitalises a few paths (#9618) 2021-11-22 20:02:25 +00:00
SkyratBot
a94325afe4 [MIRROR] Replacing more C-style for loops with the faster, traditional ones. [MDB IGNORE] (#9560)
* Replacing more C-style for loops with the faster, traditional ones. (#62908)

* Replacing more C-style for loops with the faster, traditional ones.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-19 20:37:13 +00:00
SkyratBot
ee954bbb11 [MIRROR] Fixes throw mode putting you on click cooldown despite not throwing [MDB IGNORE] (#9427)
* Fixes throw mode putting you on click cooldown despite not throwing (#62749)

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* Fixes throw mode putting you on click cooldown despite not throwing

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
2021-11-13 09:00:39 -05:00
SkyratBot
2543559ec7 [MIRROR] Chimps no longer get grumpy when you hug them or throw things with no throw force at them. [MDB IGNORE] (#9361)
* Chimps no longer get grumpy when you hug them or throw things with no throw force at them. (#62685)

* Chimps no longer get pissed when you hug them.

* Pun Pun no longer hates hat throwing.

* Chimps no longer get grumpy when you hug them or throw things with no throw force at them.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-10 10:25:52 -05:00
SkyratBot
e598a0dd33 [MIRROR] Beepsky refactor and Bot code improvement [MDB IGNORE] (#9304)
* Beepsky refactor and Bot code improvement

* Feex

* Fixing the maps so they work :)

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-08 21:28:35 -05:00
SkyratBot
b7b6bd501f [MIRROR] removes double spaces AFTER symbols [MDB IGNORE] (#9226)
* removes double spaces AFTER symbols

* Fixing conflicts

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-05 18:15:12 -04:00
SkyratBot
8213460bdf [MIRROR] Mention in the rendering docs that the byond displacement filter is not actually a displacement filter [MDB IGNORE] (#9088)
* Displacement maps in byond are not displacement maps (#62403)

Totally forgot to add this

* Mention in the rendering docs that the byond displacement filter is not actually a displacement filter

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-10-27 18:54:14 -04:00
Iamgoofball
fd577e0227 GoofSec: Departmental Guards, Stamina Crit Fixes, Armory Rework, 3-Hit-Stamcrit Batons, Flashbang fixes (#8524)
* GoofSec: Departmental Guards, Stamina Crit Fixes, Armory Rework, 3-Hit-Stamcrit Batons, Flashbang fixes

* More realism changes to the guns.

* "lmao lets just make bullets do double damage!!!!!"

* maint-fu properly restored

* fixes disabler desc

* sagwfwdqdqa

* Departmental Guard Drip + Fixing Guard Rolling Antags

* adds the trims for the guards

* haha yes i totally forgot the knockdown

* Brute damage hardlight bullets + map fixes!

* afwefqdqwd

* fixes security armor balance lmfao

* NICE FUCKIN MERGE CONFLICT

* Big Security Armor Rework + Fixing cell swapping issues

* Space Police!

* removes 2hand from the guns for now

* Fixes Guard antag rolling.

* Stamina crit filter is back!

* Fixed vendors, 911 overhaul, Re-added sec crates to cargo

* whoops haha

* afwvwsadcwaed

* efWEFwedqadq

* bank error, you have been rewarded 20 thousand credits

Co-authored-by: Funce <funce.973@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-26 17:17:20 +01:00
SkyratBot
404a603dc2 [MIRROR] runtime fix for borgs cryoing with upgrade modules + no more mmi laying around after they cryo, and various other runtime fixes [MDB IGNORE] (#8975)
* runtime fix for borgs cryoing with upgrade modules + no more mmi laying around after they cryo, and various other runtime fixes

* Fixing conflicts

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-23 00:25:25 +01:00
SkyratBot
24f3d27c8b [MIRROR] Adds 2 new signals, adds pre/postattack_secondary signals to circuit signal handler presets (+a proccall component fix) [MDB IGNORE] (#8969)
* Adds 2 new signals, adds pre/postattack_secondary signals to circuit signal handler presets (+a proccall component fix) (#62233)

Adds COMSIG_ITEM_AFTERATTACK_SECONDARY and COMSIG_MOB_ITEM_AFTERATTACK_SECONDARY signals, which are both called by item/proc/afterattack_secondary.
Adds COMSIG_ITEM_PRE_ATTACK_SECONDARY and COMSIG_ITEM_AFTERATTACK_SECONDARY to the list of circuit signal handler presets.
The proc call, set var, and spawn atom components will resolve any weakrefs passed to them in their parameter port, seeing as the list literal component now converts datums into weakrefs.

* Adds 2 new signals, adds pre/postattack_secondary signals to circuit signal handler presets (+a proccall component fix)

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
2021-10-23 00:24:37 +01:00
SkyratBot
457644fd27 [MIRROR] clickon signal procs cleanup (fixes inability to examine things in certain situations). [MDB IGNORE] (#8928)
* clickon signal procs cleanup (fixes inability to examine things in certain situations).

* Mirror!

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-10-22 23:18:33 +13:00
Gandalf
72f6221689 Interactions tidyup (#8850)
* Updated interactions

* Update interaction_menu.dm

* Colors

* Update interaction_menu.dm

* Update interaction_menu.dm

* Update interaction_menu.dm

* Better code for all.

* Update interaction_component.dm

* Removes support for TARGET SPEAK and USER SPEAK due to instability.

* Update interactions.dm

* Update interaction_component.dm

* Enables you to interact from a distance again.
2021-10-18 01:01:14 +01:00
SkyratBot
719746260b [MIRROR] Fixed the join/ready buttons not reverting if the game fails to setup. [MDB IGNORE] (#8885)
* Fixed the join/ready buttons not reverting if the game fails to setup. (#62112)

This will fix #61580

* Fixed the join/ready buttons not reverting if the game fails to setup.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-10-17 12:45:34 +01:00
SkyratBot
873d80335a [MIRROR] Fixes overlay lighting not having any color [MDB IGNORE] (#8873)
* Fixes overlay lighting not having any color. (#62087)

The overlay lighting plane was never actually being drawn, only used as an alpha filter over the main lighting plane.
That's fine to do, but it only cuts away darkness, doesn't actually lay down any color.

So let's properly draw it too, so things look right

Fixes #61899

* Fixes overlay lighting not having any color

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-10-16 20:40:09 -04:00
Seris02
1fc674a3d8 yeet gandalf broke my shitcode + a runtime fix (#8837) 2021-10-15 13:03:05 -04:00
SkyratBot
3701087507 [MIRROR] Fix ambient occlusion stacking [MDB IGNORE] (#8664)
* Fix ambient occlusion stacking (#61822)

Fixes filter not being removed and relays stacking up

* Fix ambient occlusion stacking

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-10-08 08:25:54 -04:00
SkyratBot
fc024162f1 [MIRROR] Fixes riding abilities by sharing action buttons. [MDB IGNORE] (#8688)
* Fixes riding abilities by sharing action buttons (#61854)

* Fixes riding abilities by sharing action buttons.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-10-08 08:24:01 -04:00
SkyratBot
b5cb1d7c07 [MIRROR] Add undocumented render debug command to the rendering documentation [MDB IGNORE] (#8679)
* Add debug suggestions (#61908)

.debug profile mapicons
prints a massive oneline json with the data of all currently onscreen rendering objects

* Add undocumented render debug command to the rendering documentation

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-10-08 08:12:17 -04:00
SkyratBot
3c20b53bd3 [MIRROR] Replaces the Mafia button with the Minigames button. Adds tgui panels for selecting minigames and for CTF [MDB IGNORE] (#8659)
* Replaces the Mafia button with the Minigames button. Adds tgui panels for selecting minigames and for CTF (#61638)

This PR replaces the Mafia button on the observer HUD with a minigames button that allows you to access both CTF and Mafia.

It also adds a CTF menu that allows you to view current scores, players needed to start a game, and joining a ctf game without needing to move to the spawner.

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

* Replaces the Mafia button with the Minigames button. Adds tgui panels for selecting minigames and for CTF

Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Mothblocks@ users.noreply.github.com>
2021-10-07 12:55:09 -04:00
SkyratBot
cc93b11d23 [MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)
* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-06 22:07:01 +01:00
SkyratBot
580dbd5ec5 [MIRROR] Revert "ClickOn now actually calls ranged right click attacks" [MDB IGNORE] (#8616)
* Revert "clickon now includes attack_secondary (#61848)" (#61900)

This reverts commit a7c69aa341.

* Revert "ClickOn now actually calls ranged right click attacks"

Co-authored-by: oranges <email@oranges.net.nz>
2021-10-05 15:55:08 +13:00
SkyratBot
6fcb215411 [MIRROR] ClickOn now actually calls ranged right click attacks [MDB IGNORE] (#8582)
* clickon now includes attack_secondary (#61848)

I... don't know how this was missed. Ranged right clicks only called post secondary attacks, which is hilarious and mysterious. How did NOBODY notice you could only hold someone up in MELEE range?

I also named the vars in the proc to be more readable, and added a few early returns. I didn't touch much about the top part of the proc so it may still look gross.

* ClickOn now actually calls ranged right click attacks

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-10-03 23:00:25 +01:00
SkyratBot
6a3a1aed83 Rendering refactor P1: Plane unification and render relaying (pictures and video included) (#8479)
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-10-01 00:08:39 +01:00
GemInee
ae2111bfc0 organic ui fix (#8457)
* organic ui fix

Reimplementing UI fixes

* fuc u, i won

* some skyrat buerocracy stuff

Co-authored-by: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
2021-09-28 18:05:06 +01:00
SkyratBot
ec84d03d09 [MIRROR] FAMILIES 4.0: "fuck it, MRP only this time" (#8420)
* FAMILIES 4.0: "fuck it, MRP only this time"

* F

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-28 00:08:13 +01:00
SkyratBot
93675c6c6f [MIRROR] Changes a bunch of New()s to Initialize()s (#8408)
* Changes a bunch of New()s to Initialize()s (#61626)

* Changes a bunch of New()s to Initialize()s

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-09-26 14:27:27 +01:00
SkyratBot
c23bd1cb8c [MIRROR] every case of initialize that should have mapload, does (#8374)
* every case of initialize that should have mapload, does

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 23:07:53 +01:00
SkyratBot
c5811c8fd6 [MIRROR] Refactors offering items, adds cheek kisses (#8346)
* Refactors offering items, adds cheek kisses

* Update hand_items.dm

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 18:31:16 +01:00
SkyratBot
e8d78089fc [MIRROR] [TM Candidate] Overhauls orbit and POI code to fix part of issue #61508 where players could observe /mob/living/new_player on the lobby. (#8339)
* [TM Candidate] Overhauls orbit and POI code to fix part of issue #61508 where players could observe /mob/living/new_player on the lobby.

* E

* Missed merge

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 18:16:17 +01:00
SkyratBot
124ddd7cca [MIRROR] tgui Preferences Menu + total rewrite of the preferences backend (#8153)
* tgui Preferences Menu + total rewrite of the preferences backend

* nah, we dont need to ping those people

* trying to remove the funny stuff

* unmodularizing this

* prefs reset

* this may need to be reverted, who knows

* okay, this part

* perhaps

* EEEEEEEEE

* unsanitary

* E

* Stage 1 + loadout system

* more fixes

* E

* I mean, it launches?

* More fixes and reorganisation

* E

* customisation code is spaget.

* disable ERP prefs

* Update erp_preferences.dm

* Update erp_preferences.dm

* E

* Slowly getting there

* It may be time for help :)

* tri...colors... help

* preferences now pass preferences

* Update dna.dm

* Fuck this man

* missing savefile return, set_species works, removed dumb stuff from updateappearance

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8199

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8224

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

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8278

* e

* le butonAZARAK HELLO

* hhh

* Proper recognition where it's due, MrMelbert!

* EEEE

* examine block

* Better gen hit sounds from whitedream

* final loadout touches, more bug fixes im sure to come

* i said there would be bugfixes

* Update LoadoutManager.js

* Missing preferences in the html menu

* LIVE TESTING PHASE BABY

* Update LoadoutManager.js

* EEE

* LAUNCH TEST FIRE

* Update job.dm

* Update new_player.dm

* 50gb DAY ONE PATCH

* EEE

* Update preferences.dm

* buggle fixes

* Update examine.dm

* >LOOC starts on

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-09-23 00:40:37 +01:00
SkyratBot
6bfb914351 Harddeletes: Accident edition (#8294)
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-09-20 23:20:46 +01:00
SkyratBot
6620afa472 [MIRROR] Fix parallax animation (#8111)
* Fix parallax animation (#61341)

so it turns out lummox changed the behavior of loops, such that the starting point of loops has to be the same as the end so if you want a discontinuous jump you have to have an "initial state" time=0 frame in the animation

* Fix parallax animation

Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
2021-09-11 12:16:29 +01:00
SkyratBot
04302a770a [MIRROR] moves obj_integrity and associated procs to the atom level (#8016)
* moves obj_integrity and associated procs to the atom level

* Feex good

* Whoops forgot the maps

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-10 16:47:01 +01:00
SkyratBot
b2282cb4c2 [MIRROR] Attempts to drag before checking machine interactability (#8062)
* drags before hotkeying (#61278)

* Attempts to drag before checking machine interactability

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
2021-09-09 15:07:32 -04:00
SkyratBot
137d356269 [MIRROR] pAI minor refactor and cyborg PDA code/visual improvements (#7961)
* pAI minor refactor and cyborg PDA code/visual improvements (#61112)

* pAI minor refactor and cyborg PDA code/visual improvements

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-09-03 23:57:25 -04:00
GoldenAlpharex
31b3a9331e [MIRROR] Replaced the lobby menu (with actual art) (#60953) (#7748)
* Replaced the lobby menu (with actual art) (#60953)

* a

* a

* Update new_player.dm

* Update new_player.dm

* Update new_player.dm

* a

* a

* Update new_player.dm

Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 17:07:48 +01:00
Useroth
f900b1ec6d [MDB IGNORE] Eliminates Toxins (#60619) (#7911)
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.

Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.

Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.

Makes the code more legible and makes mapping less painful.

(The payment has been made)

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:50:22 +01:00
SkyratBot
02ad59791b Basic Mobs: the cooler simple mobs that run on datum AI. (With reworked cockroach AI as proof of concept) (#7867)
Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:47:39 +01:00
SkyratBot
eedc63bbff [MIRROR] tgui: Silicon Station Alerts (#7847)
* tgui: Silicon Station Alerts

* 0

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:38:53 +01:00
SkyratBot
eae7233c5b [MIRROR] small refactor to can_interact() so that borg range is fully respected (#7891)
* small refactor to can_interact() so that borg range is fully respected (#60693)

Its a relatively small refactor that changes the previous machinery "can_interact()" proc that literally did a full override despite half of their checks already existing in not one, but TWO parent procs, so i removed the redundant checks, added callbacks to its parents and then added the cyborg range check on the can_interact_with() itself. in doing so i also moved the interaction range var from silicons only, to mobs as a whole and defaulted it to a single tile, silicons override it to 7 (so pAIs and borgs like before) but then set AI and AI.eye to "null", because i have a check in can_interact that if there is no range set, then the range is effectively unlimited. and i even added code for when AI is carded and their wireless transmission is disabled it sets their range to "0" aka, it has no range to do anything even if it could

this was really complicated for me so despite my extensive testing it probably would be a bad thing if any of you want to test my code yourself to ensure there isnt a bug with this (theres no runtimes ive come across)

note: i did a lot of searching and going through machinery to ensure i caught all the little snowflake overrides and added can_interact() checks to them, but i may have missed one or two things, especially maybe a altclick or ctrlclick somewhere, however i believe i caught most of them

one nice side effect of this refactor is that you can actually set another mobs range to something other than 1 tile and they can interact at range, rather than only silicons getting this ability, an admin could VV a human to have a 3 tile arm reach as a meme if they want

* small refactor to can_interact() so that borg range is fully respected

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
2021-08-31 20:26:36 +01:00
SkyratBot
85270809c5 [MIRROR] Fix grammar when attacked by an unknown assailant (#7877)
* Fix grammar when attacked by an unknown assailant (#61103)

* Fix grammar when attacked by an unknown assailant

Co-authored-by: esainane <esainane+github@gmail.com>
2021-08-31 10:38:20 -04:00
SkyratBot
81458fa463 Fixes monkey being unable to access right click functions on many objects. (#60990) (#7753)
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-24 22:05:56 -04:00
SkyratBot
b0c01e40af [MIRROR] Del The World: Unit testing for hard deletes (#7589)
* Del The World: Unit testing for hard deletes (#59612)

Co-authored-by: SteelSlayer <42044220+SteelSlayer@ users.noreply.github.com>

* Del The World: Unit testing for hard deletes

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@ users.noreply.github.com>
2021-08-17 18:58:57 +01:00
Lamella-0587
a702f9bd9f organic interface update (#6740)
* initial

* whoops

* more fixes

* forgot

* frick

* oop

* minor visual fixes

* cleared out-of-date stuff that was asimilated by erp update. ye, sry for that but useroth said i can if i need to

* interface fixes + cleaned trash.

* fixesss

* more fixes

* other interface fix and im dumb

* text and fonts fixes

* mapfixes

* small item fix

* floppa my beloved

* fixme

* yepp

* little addition to vibrator

* more user friendly toys

* hotfix because im dumb

* informing user about stuff happening in their genitals

* Fixed strip menu for new slots

* Vibrating toys now makes constant vibration sounds.

* fucking ton of fixes, i debugged so much stuff i want to die when did i slept last time

* signal vibrator fixes

* i guess its all bugs for now, need testing

* hotfix

* chemicals fixed. other dumb bug fixed too

* feex

* undo

* aight, some text stuff

* repsrited signal vibrator, fixed some dumb bugs. Almost ready for tommorrow pr.

* tried to fix things, need to test

* fixed?

* maybe now its fixed

* we finished here.

* yeah, credits. I forgot them.

* Oh well, resolved the conflict wrong.

* map fixed

* formatting test

* more linter stuff

* did changed that skyrat asked me to

* kinda fixed more stuff

* remove mapchanges

* no magic like kat magic

* please

* further mapchanges removal

* fix

* little fix, because one map supposed to be changed.

* quick structure fixes + balance stuff

* some fixes. remind - fix worn tomorrow.

* ah fuck it, i fixed it now. Who need sleep anyway?

* furnitures are no longer invuln

* fixes poles

* milking machine uses cuffs instead

* makes stuff uses cuffs

* frick

* fix lints

* stuffe

* line

* Forgot to add this little feature

* OKAY FINE I GUESS 10 MINUTES IS TOO MUCH.

* squashed bugs

* minor fix to prevent visual bugs with pillow piles.

* frick

* removed logging

* pref for toys

* tabs

* suggested idea added

* hot fix

* Revert "suggested idea added"

This reverts commit 33796f0abb896b83d02dbefee4e3b62df5f6a5db.

* Revert "hot fix"

This reverts commit bf0bc6330f5897ce2d67bb9571eb818d3a64325b.

* fuck the suggestions, i just want it to work fine

* fuck the suggestions, i just want it to work fine

* truly fixes lints

* balance tweaks + fleshlight fixed

* more balance tweaks

* gasmask fixes. Now it doesn't kill people but still makes them suffer

* fix ball mittens

* dead people tell no tales

* some minor fixes

* grammars

* add messages

* use a new pref

* simple check

* knock-knock. Who? A fix.

* fuck

* fixes vibrators

* hexacrocin now can be cured properly

* fix x_stand

* frick

* FUCK

* fixes everyonr being horny

* fixes pain

* fixes strapon

* stop process

* nymphomania fixed

* fix spam

* fixed heels and quirks

* Dead people shouldn't cum

* Knock-knock. A penis enlarger fix

* use the traits goddamn it

* Nymphomania fix

* Fucking moths can't now chomp vibrators

* Added yes/no check to climax button, also some improvements and multiple messages bugfix

* milking machine balance tweaks, bimbo trauma fix

* milking machine construction messages added

* some fixes

* Revert "Fucking moths can't now chomp vibrators"

This reverts commit 2bf37ca3b0b98c3bbd7bf35626faa7a0be54fcfb.

* little clean up of code, but it still doesn't works properly

* fuck the moths. You can't eat vibrators once more.

* catsuit bug fix

* balance tweaks

* Pillows now made of cloth, not metal.

* pillow fixes

* masochism quick fix

* dumb quickfix, it will break anything, don't panic

* yay now it works again

* nymphomania fix

* clean up

* half of ball mittens fix. For another half buy our DLC just for 2,99$!

* IM COOL I FIXED THE BALL MITTENS! FINALLY!

* prefs now works properly

* pain stuff fixed, i guess. no more arousal by decompression damage.

* lol how did i missed those

* can't buckle fucking cows to milker anymore

* oops

* me cool

* fixed small bug with pillows

* gasmask quick fix

* fix spam

* fixes strapon

* balance stuff.

* fix because im dumb

* fix

* the last fix for this codebomination. I hope this is it.

Co-authored-by: Katherine Kiefer <sterlite2902@gmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
2021-08-13 19:33:44 +02:00
SkyratBot
d2d89a863a [MIRROR] [Ready] Mining Loot Rework (#7461)
* [Ready] Mining Loot Rework

* AAAA

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-10 16:12:36 +01:00
SkyratBot
5ad507f0bc [MIRROR] railings can now be vaulted/climbed over from both sides. (#7441)
* railings can now be vaulted/climbed over from both sides. (#60110)

Quality of life; it spares us from having to walk all the way around or destroy them with either a wirecutter (faster) or any impromptu weapon (slower, as they currently have 300 maximum integrity, despite taking only three iron rods - one more than grilles - to make) in certain occasions, and it's already a thing on other codebases that have railing objects.

* railings can now be vaulted/climbed over from both sides.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-06 23:25:11 +01:00
SkyratBot
9098086959 [MIRROR] Adds a preference to make flashes darken your screen (#7308)
* Adds a preference to make flashes darken your screen (#60434)

* Adds a preference to make flashes darken your screen

* aaa

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-03 21:03:12 +01:00