Commit Graph

18554 Commits

Author SHA1 Message Date
variableundefined
3a3ff1400a Merge pull request #13447 from EMPlight/BulldogXLmag
Adds Bulldog extended drum mags and bundle for nuke ops.
2020-09-14 16:45:04 -04:00
mochi
b05eded1d8 Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 22:13:04 +02:00
variableundefined
f5b7554c1a Merge pull request #12851 from SteelSlayer/internals-auto-push-up
Activating internals automatically pushes breath masks into place
2020-09-14 16:02:45 -04:00
AffectedArc07
73acdcb221 Merge pull request #12628 from SteelSlayer/IPC-buffs
IPC balance changes
2020-09-14 20:59:13 +01:00
mochi
e07306f20d Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 20:04:48 +02:00
SteelSlayer
2a70626c78 affected review tweaks 2020-09-14 11:38:17 -05:00
SteelSlayer
6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07
a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul
Overhauls and Refactors Alarm System
2020-09-14 13:54:06 +01:00
variableundefined
779704356e Merge pull request #13601 from SteelSlayer/borger-tweaks
Cyborg factory tweaks/improvements.
2020-09-13 20:43:21 -04:00
Fox McCloud
e6bd4b6638 fix ups 2020-09-13 18:33:21 -04:00
AffectedArc07
2bd9c8367b Merge pull request #14163 from Qwertytoforty/Ai-blackout
Allows Malf AI to spend CPU to destroy it's core camera.
2020-09-12 23:47:02 +01:00
AffectedArc07
706dc6e3c6 Merge pull request #14233 from RedWolfie/chameleon
chameleon flag fix
2020-09-12 23:45:09 +01:00
joep van der velden
062f275b6c On tray not cyb tray 2020-09-12 10:34:31 +02:00
joep van der velden
5244b49e4e Revert the . = ..() 2020-09-12 10:28:01 +02:00
joep van der velden
33f1353126 cyborg trays drop stuff upon death. NAD disallowed 2020-09-12 10:24:12 +02:00
SteelSlayer
f0fd61bb0d Merge remote-tracking branch 'upstream/master' into IPC-buffs 2020-09-10 17:20:35 -05:00
Kugamo
b6ad29a1ec fixes oversight, that made some scanned objects appear solid 2020-09-08 11:42:21 -05:00
AffectedArc07
7ee337b9e6 Merge pull request #14259 from RedWolfie/blind-weld
Fixes some messages
2020-09-08 12:01:23 +01:00
Certhic
77258b9b0c fixes garrote typo 2020-09-07 20:59:36 +02:00
AffectedArc07
43dbf9d0c1 Merge pull request #14246 from dearmochi/auto-reconnect-after-reboots
Adds auto-reconnect chat feature on server reboot
2020-09-07 18:37:21 +01:00
mochi
cc7c18f2f9 Add auto-reconnect chat feature on server reboot 2020-09-06 13:47:28 +02:00
AffectedArc07
df8896d0e3 Merge pull request #14148 from SabreML/Cling-icon-merge
Combines Changeling 'Channel DNA' and 'Absorb DNA' into one button
2020-09-06 11:25:49 +01:00
Certhic
070904dd7b smoke bomb runtime fix 2020-09-06 12:16:05 +02:00
Certhic
720a16e7e1 replaced spawn with addtimer 2020-09-06 12:15:50 +02:00
AffectedArc07
8197d5af7d Merge pull request #13922 from SabreML/Direction-Signs-1
Updated Direction sign sprites.
2020-09-06 10:47:35 +01:00
AffectedArc07
989abe54e7 Merge pull request #14195 from Qwertytoforty/Return-of-the-speed-limit
Makes gygax take damage from mecha overload again
2020-09-06 10:11:58 +01:00
SabreML
65e514cdbe Review tweaks for readability 2020-09-06 02:08:46 +01:00
AffectedArc07
8d687bfd7f Merge pull request #14221 from kugamo/Moon-Runes
Fixes Wingdings
2020-09-04 18:49:01 +01:00
AffectedArc07
ccdd738e75 Merge pull request #14229 from SabreML/Locker-lock
Allows lockers to be locked/unlocked by Alt Clicking
2020-09-04 18:46:51 +01:00
AffectedArc07
4817fdc0ed Merge pull request #14226 from kugamo/air-scrub-bugs
Fixes [Huge Air Scrubber] wrenching bug
2020-09-04 18:46:31 +01:00
Certhic
dd8740d3df chameleon flag fix 2020-09-04 13:47:16 +02:00
SabreML
d33561bea9 Alt clicking now locks/unlocks lockers 2020-09-04 05:09:56 +01:00
Kugamo
e67a751c0c moves play sound code after other logic 2020-09-03 13:24:26 -05:00
Kugamo
c640c871d3 cleans up code 2020-09-03 13:22:50 -05:00
Kugamo
fa2a72e0eb Fixes unwrenching bug 2020-09-03 12:36:58 -05:00
Kugamo
b2239bb8fa implaments faster for loop logic 2020-09-02 10:22:45 -05:00
Kugamo
13d02fabb1 removes string2charlist(), fixes spacing 2020-09-02 10:10:32 -05:00
Kugamo
c6b221d268 Fixes Wingdings 2020-09-02 09:51:27 -05:00
Kugamo
e0a7889e75 Adds inhand sprites, makes naming more consistant 2020-09-02 05:49:05 -05:00
AffectedArc07
0ccf04ba23 Merge pull request #14056 from SabreML/Wood-Deconstruction
Makes more wooden structures deconstructable.
2020-09-02 11:05:33 +01:00
AffectedArc07
75bbf7a6d5 Merge pull request #14088 from kugamo/Inhand-sprites-for-cigarette-packets
Inhand sprites for cigarette packets
2020-09-02 11:04:41 +01:00
AffectedArc07
299583b3e1 Merge pull request #14197 from farie82/mech-hand-attack-notice
Makes the attack_hand on mechs and borgs less annoying
2020-09-02 11:01:35 +01:00
AffectedArc07
b00304ebf1 Merge pull request #14209 from denghis1/plastic_create_cone
Feature: Make warning cone craftable
2020-09-02 11:00:51 +01:00
AffectedArc07
35682a8e20 Merge pull request #14210 from RedWolfie/crayon
[Bugfix] Orange cables
2020-09-02 11:00:23 +01:00
Certhic
916d358ad3 replaced some magic values 2020-09-01 16:26:25 +02:00
Certhic
90ac9874b2 fixed orange crayons not making cables orange 2020-09-01 16:23:53 +02:00
denghis1
7705a8c01a Removed the crafting time of the warning cones
Removed the crafting time of the warning cones, since it was so low anyway.
2020-09-01 16:07:49 +02:00
denghis1
451f1548a9 Made warning cones craftable
Added warning cones to the global plastic_recipies list, this makes them craftable in-game.
2020-09-01 15:54:29 +02:00
AffectedArc07
6770dbf231 Merge pull request #14183 from kugamo/Adds-Flagellant-Rob-Sprites
Adds flagellant robe sprites
2020-08-31 23:05:08 +01:00
variableundefined
c8c1800b57 Merge pull request #13943 from AffectedArc07/more-tcomms-tweaks
*more* Tcomms Tweaks
2020-08-31 16:05:05 -04:00