Commit Graph

5537 Commits

Author SHA1 Message Date
Kugamo 702fbbfdb3 this is acutally is a better fix
my first commit didnt account for the possibility that the revealed item could be destroyed, this way also eliminates another if statement. BUT it still goes through the full cycle for the objects(they still appear translucent for a time)
2020-08-29 19:03:27 -05:00
Kugamo 811dd2c454 fix 2020-08-29 18:31:21 -05:00
AffectedArc07 ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor
TG Flying+Floating Refactor
2020-08-27 20:08:35 +01:00
AffectedArc07 3fb3353bc8 Merge pull request #14068 from ExusA/Spray-Fix
Hydroponics Spray Fix
2020-08-19 11:18:33 +01:00
ExusA c1756fe7e3 Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-08-19 18:09:13 +08:00
AffectedArc07 ce0eb1fbdc Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order
Fix colored lips drawing over masks and random lipstick colouring
2020-08-19 10:46:04 +01:00
mochi 346b54ad26 Fix random lipstick colour always defaulting to white 2020-08-19 10:20:14 +02:00
ExusA 9f62b5534b fixes indentation and duplicate code 2020-08-18 22:21:25 +08:00
AffectedArc07 5037e43341 Merge pull request #14073 from ExusA/toy-descs
Adds Figurine Descriptions
2020-08-18 13:01:34 +01:00
AffectedArc07 233c60058d Merge pull request #13710 from dearmochi/overhaul-event-mob-selection
Overhaul event mob selection
2020-08-18 10:55:24 +01:00
AffectedArc07 69cd58c1df Merge pull request #13934 from SabreML/Maint-Drone-Stuff
Maintenance Drone Tweaks
2020-08-17 13:35:59 +01:00
AffectedArc07 2d1ba4ab56 Merge pull request #14005 from dearmochi/baton-refactor
Telebaton fix, refactor and documentation
2020-08-16 20:08:33 +01:00
AffectedArc07 f65e8f1d7f Merge pull request #13899 from dearmochi/flashbang-light-vfx
Update flashbang FX and code clean-up
2020-08-16 20:00:48 +01:00
ExusA f0dc996149 Update belt.dm 2020-08-16 23:50:30 +08:00
ExusA 9401458416 actually what i meant to submit 2020-08-16 21:53:46 +08:00
AffectedArc07 07301da5d2 Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob
ID Computer Demotion/Termination Upgrades
2020-08-16 13:14:42 +01:00
ExusA abbb1e05fb Update toys.dm 2020-08-13 16:16:36 +08:00
ExusA addb0c1a26 Update belt.dm 2020-08-13 15:00:49 +08:00
ExusA f61d92ef0e Merge branch 'master' into Spray-Fix 2020-08-13 14:46:16 +08:00
ExusA 0f95e7308f Revert "Fixes hydro sprays"
This reverts commit 266939684f.
2020-08-12 23:21:20 +08:00
ExusA ee65493c3f Update sheet_types.dm 2020-08-12 23:20:48 +08:00
ExusA 51c63c64c3 Update belt.dm 2020-08-12 20:17:21 +08:00
ExusA 266939684f Fixes hydro sprays 2020-08-12 20:09:53 +08:00
mochi 96bf4396a0 Merge branch 'master' into overhaul-event-mob-selection 2020-08-12 01:22:52 +02:00
AffectedArc07 0aa89bd3de Merge pull request #13748 from Fox-McCloud/rig-purge
Purges Rigs
2020-08-09 18:21:39 +01:00
AffectedArc07 601a5db433 Merge pull request #13378 from Fox-McCloud/applicator-tweaks
Applicator QoL Tweaks
2020-08-08 16:53:18 +01:00
AffectedArc07 fcd6f900b9 Merge pull request #13175 from farie82/logging-improvements
Logging view improvements
2020-08-08 16:23:06 +01:00
mochi 038bb7a3a6 Merge branch 'master' into fix-stuff 2020-08-07 10:07:18 +02:00
mochi 5720b0b8b2 Clean up code and make telebaton verbs static 2020-08-06 21:54:56 +02:00
mochi b9e44c869e Baton knockdown animation, refactor & doc 2020-08-03 22:38:16 +02:00
mochi 1bf16ee40c Update flashbang FX and code clean-up 2020-08-03 19:50:58 +02:00
Kyep 7c9019d74b Merge remote-tracking branch 'ParadiseSS13/master' into id_computer_demote_terminate_freejob 2020-08-01 17:39:30 -07:00
AffectedArc07 debcf5dad0 Replaces all "var " with "var/" 2020-07-29 10:06:00 +01:00
SabreML 4f05dc2354 Update lightreplacer.dm 2020-07-27 03:38:52 +01:00
SabreML 7da32e28ba Fixes light replacer grammar. 2020-07-27 03:32:37 +01:00
Fox McCloud a174b632fc Merge pull request #13905 from AffectedArc07/book-drm
Adds book DRM
2020-07-25 20:07:01 -04:00
Fox McCloud 2204bd4e28 Merge pull request #13911 from dearmochi/lipstick-fix
Fix lipsticks
2020-07-24 20:42:09 -04:00
joep van der velden fffe72e258 Fixes dupe with wet leather 2020-07-24 21:00:59 +02:00
mochi 6085508428 Fix lipsticks 2020-07-24 18:33:15 +02:00
AffectedArc07 1c1b4fa8c7 Makes book DRM apply to printed books 2020-07-23 12:42:28 +01:00
Fox McCloud cb48f4fe8c Merge pull request #13833 from warior4356/matches
Refactors matter decompiler and adds some missing trash to the list
2020-07-21 15:54:07 -04:00
Fox McCloud 62e74c80d2 Merge pull request #13811 from TDSSS/glass
Build time for aquariums
2020-07-21 15:53:46 -04:00
Fox McCloud 1e45410dcc Merge pull request #13890 from AffectedArc07/tgui-inconsistency-tweaks
Fixes a bad practice in existing TGUIs
2020-07-21 15:49:34 -04:00
AffectedArc07 7e965624b4 Fixes null mind runtimes with roasry nullrod (#13875) 2020-07-21 03:38:06 -06:00
Aidenzack1 15522dae9e fixes certain items unable to light plasma sheets (#13871)
* fixes certain items unable to light plasma sheets

fixes matches, lighters, and candles from being unable to properly light plasma sheets on fire

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm

* Update mineral.dm
2020-07-21 03:34:54 -06:00
AffectedArc07 aa986436e1 Fixes a bad practice in existing TGUIs 2020-07-21 08:21:53 +01:00
TDSSS 4253f695ad remove time from windows again 2020-07-20 20:21:22 +02:00
mochi 25fa3f23cf Merge branch 'master' into overhaul-event-mob-selection 2020-07-20 07:01:11 +02:00
AffectedArc07 b511d55cd4 Gamebreaking bug fix immediately 2020-07-15 20:04:08 +01:00
warior4356 b30ff7e2e9 Minor fixes. Removes Plastic 2020-07-14 21:26:45 -07:00