Kyep
be024bbbcc
Merge remote-tracking branch 'ParadiseSS13/master' into skills_rework
2020-09-19 06:39:38 -07:00
RedWolfie
61b122aaf3
corrected blind message when knocking someone off a table ( #14370 )
2020-09-18 12:47:53 -04:00
AffectedArc07
90fd9a8fb8
Removes all relative heresy ( #13969 )
...
Removes all relative heresy
2020-09-16 12:52:20 -04:00
joep van der velden
0bfe9d994e
Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co
2020-09-16 15:26:19 +02:00
variableundefined
fc7af0f5a4
Merge pull request #13883 from ppi13/patch-2
...
Removes GPS from Lavaland Tendrils
2020-09-15 20:08:19 -04:00
Kyep
995165ae38
fixes merge conflict
2020-09-15 11:39:00 -07:00
mochi
b05eded1d8
Merge branch 'master' into instrument-tgui-n-optimization
2020-09-14 22:13:04 +02:00
mochi
e07306f20d
Merge branch 'master' into instrument-tgui-n-optimization
2020-09-14 20:04:48 +02:00
SteelSlayer
f0fd61bb0d
Merge remote-tracking branch 'upstream/master' into IPC-buffs
2020-09-10 17:20:35 -05:00
AffectedArc07
8197d5af7d
Merge pull request #13922 from SabreML/Direction-Signs-1
...
Updated Direction sign sprites.
2020-09-06 10:47:35 +01:00
SabreML
d33561bea9
Alt clicking now locks/unlocks lockers
2020-09-04 05:09:56 +01:00
AffectedArc07
0ccf04ba23
Merge pull request #14056 from SabreML/Wood-Deconstruction
...
Makes more wooden structures deconstructable.
2020-09-02 11:05:33 +01:00
variableundefined
5d0b64b0c9
Merge pull request #14087 from AffectedArc07/removes-butterfly-crate
...
Nerfs butterfly crate
2020-08-28 14:16:58 -04:00
joep van der velden
55d0dc8003
Fixes the exploit where you can put unlimited items in a locker
2020-08-21 23:55:32 +02:00
Kyep
e3b82a70a3
Replaces skills computer with skills HUD eyewear
2020-08-17 06:02:55 -07:00
AffectedArc07
69cd58c1df
Merge pull request #13934 from SabreML/Maint-Drone-Stuff
...
Maintenance Drone Tweaks
2020-08-17 13:35:59 +01:00
SabreML
de535bba3e
Allows Robots to open and close extinguisher cabinets.
2020-08-17 13:15:21 +01:00
AffectedArc07
c9f17cab6c
Makes it so 1 butterfly still exists
2020-08-17 11:20:46 +01:00
AffectedArc07
2b48fa853d
Revert "Deletes butterfly crate"
...
This reverts commit 1506653349
2020-08-17 11:19:42 +01:00
AffectedArc07
1506653349
Deletes butterfly crate
2020-08-15 22:42:39 +01:00
AffectedArc07
09ef06a7ec
Merge pull request #13896 from Kyep/sleeper_teleport_fix
...
Fixes issues with machines/mechs when a person is teleported out of them
2020-08-11 14:29:41 +01:00
SabreML
8b55cd9965
Review tweaks
2020-08-11 10:10:19 +01:00
SabreML
79b68e0696
Better wrenching code
...
Probably
2020-08-11 05:34:53 +01:00
SabreML
5f6f54429d
Fixed wood drop oversight
2020-08-11 05:27:27 +01:00
SabreML
09fc4918c4
Allows looms to be wrenched
2020-08-10 21:20:45 +01:00
SabreML
67631d0dad
Changed message to 'to_chat'
2020-08-10 21:14:01 +01:00
SabreML
007b5acc1a
Fix loom wood quantity
2020-08-10 20:37:45 +01:00
SabreML
0f872121f4
Allows looms to be deconstructed
2020-08-10 20:30:12 +01:00
SabreML
c9e70ffbc8
Allows dressers to be deconstructed
2020-08-10 20:29:44 +01:00
CornMyCob
f3d2c5ea42
fixes exploit
2020-08-06 12:26:28 +01:00
SabreML
dfbf2bdeaf
Revert "Added Bridge direction sign."
...
This reverts commit 29252e3686
2020-07-25 15:43:42 +01:00
SabreML
5012769c37
Capitalised descriptions.
2020-07-25 04:11:41 +01:00
SabreML
29252e3686
Added Bridge direction sign.
2020-07-25 02:15:56 +01:00
mochi
79ed9b8b57
Merge branch 'master' into instrument-tgui-n-optimization
2020-07-21 23:55:11 +02:00
Kyep
ef9d5bbe7c
refactor
2020-07-21 12:12:05 -07:00
ppi13
96fddc3f91
Remove gps references
2020-07-20 20:09:12 +02:00
ppi13
05e70b7005
Deletes the line instead of commenting it out
2020-07-20 19:52:50 +02:00
ppi13
04236edf13
Removes GPS from tendrils
2020-07-20 19:30:41 +02:00
joep van der velden
8955dc7db6
Actual fix. Did a wrong analysis
2020-07-17 21:31:55 +02:00
joep van der velden
aa8d9cf26c
Fixes a kitchen spike runtime
2020-07-17 21:16:47 +02:00
mochi
24e8cd66ac
Port Baystruments PR from tgstation
2020-07-17 15:18:17 +02:00
mochi
a7e4c8af42
TGUI-ise and optimize all instrument code
2020-07-16 23:30:21 +02:00
Pidgey
3095a3468e
Makes Chicken Man statues in Mr. Chang's into real statues ( #13721 )
...
* I think this is ok?
* Chicken Man and Kidan statues are now real statues that can be moved and disassembled (disassembly causes them to vanish without dropping materials as there are no bronze or obsidian stacks). Moved their sprites from decorations to statues for consistency.
* Oops! Metastation too.
* Finally got everything sorted out. Phew!
* The OXENbot on the derelict station is no longer a renamed chicken man statue. It can also be unanchored and sliced up for metal should you be inclined to do so.
* What even is this? Delete this.
* Coding standards
* Removed density variables from the changed statues.
* Fixes conflicts
2020-07-13 14:23:56 -04:00
AffectedArc07
650c638d41
Removes semicolons
2020-07-11 18:51:45 +01:00
SteelSlayer
7b6b9e8ddd
Merge remote-tracking branch 'upstream/master' into IPC-buffs
2020-07-03 14:34:22 -05:00
denghis1
29045e16dc
closet attack_ai check for user.loc /obj/machinery/atmospherics
...
Checks if the user.loc type is part of/obj/machinery/atmospherics machines (pipes, vents etc) this prevents a ventcrawling maintenance drone from opening lockers.
2020-07-03 11:09:56 +02:00
CornMyCob
05c2629021
resolve conflicts
2020-06-29 15:20:03 +01:00
Fox McCloud
93db61665d
Speech bubble refactor and Features ( #13598 )
...
* Speech Bubble Update and Refactor
* OBJECTION
* magistrate too
* args
* clean up and plug in atom say
* better
2020-06-28 14:23:32 -06:00
Fox McCloud
5a6a0a20af
Merge pull request #13700 from farie82/armor-fixes
...
Fixes magic missing as armor value and safe codes not having armor
2020-06-26 20:14:08 -04:00
Fox McCloud
4ac8c4185c
Merge pull request #13588 from dearmochi/more-fix-stuff
...
More fixes: Custodial Locator, e-swords, upside-down-itis and grabbing
2020-06-26 20:10:20 -04:00
