Kelenius
25e7dbb86f
Cuts down shard spam
2016-03-14 14:46:43 +03:00
Yoshax
3b5a027025
Merge remote-tracking branch 'upstream/master' into splitundie
2016-03-12 02:27:54 +00:00
Yoshax
d64bfb3235
Actually fixes the underwear wardrobe
2016-03-12 02:22:34 +00:00
Yoshax
ea32fb2bd0
Fixes errors
2016-03-12 01:53:02 +00:00
Yoshax
b2916bbb56
Splits underwear into top and bottom
2016-03-11 19:26:50 +00:00
Mark9013100
905bda9b2d
Removes the need for slides in forensics
2016-03-11 03:53:12 -05:00
Datraen
9b9a23860e
Merge pull request #1149 from Kelenius/AIPDAFix
...
Fixes #1145
2016-03-10 15:25:32 -05:00
Datraen
addbfe11d5
Merge pull request #1153 from Hubblenaut/windowverbs
...
Window Verb Fix
2016-03-10 15:23:12 -05:00
Hubblenaut
c7c5e22717
verb shows on playermade windows
2016-03-10 17:06:09 +01:00
Kelenius
069a2e52a9
Fixes #1145
...
Restores 'AI IM' verb tab
2016-03-10 10:30:07 +03:00
Neerti
d412c0a070
Merge pull request #1134 from Kelenius/moreDrills
...
Constructible drills
2016-03-09 20:52:58 -05:00
Neerti
7b9f011d10
Merge pull request #1135 from Mark9013100/3/8/2016clothinglockeredits
...
Adds departmental bags to wardrobes
2016-03-08 21:10:37 -05:00
Mark9013100
bba0d7e786
Adds departmental bags to wardrobes
2016-03-08 16:37:30 -05:00
Datraen
c2b9452e08
Merge pull request #1130 from Hubblenaut/windowverbs
...
Window Rotation Verbs QOL
2016-03-08 16:35:53 -05:00
Kelenius
63e8fbab46
Constructible drills
...
Mining head circuit available in R&D
Mining brace circuit added
Mining braces can be built and disassembled
2016-03-08 20:46:31 +03:00
Hubblenaut
49d7f0ee3b
Window verbs update, wrench noise on dismantling
2016-03-07 19:12:59 +01:00
Neerti
2420ed3867
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/28/2016_armor
2016-03-06 04:19:33 -05:00
Neerti
d4793de3a0
Adds a bunch of stuff for sec armor. See PR for details.
2016-03-06 04:18:39 -05:00
Neerti
b4b8d94723
Merge pull request #1015 from Zuhayr/xenosremove
...
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti
6224e978a9
Merge pull request #1014 from Zuhayr/voxremove
...
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
EmperorJon
394b1b6dea
Merge pull request #1105 from PolarisSS13/3/1/2016_surgery_kit_fix
...
Fixes #1103
2016-03-02 23:32:06 +00:00
Kelenius
b9a9a7eb88
Merge branch 'master' into botFixes
2016-03-01 14:48:24 +03:00
Neerti
e9957302ea
Fixes #1103
2016-03-01 01:21:28 -05:00
Neerti
c7e9acbdad
Merge pull request #1082 from Datraen/FlaregunMech
...
Adds a mech flare launcher, can be mounted on any mech.
2016-02-26 22:29:47 -05:00
Neerti
23b15390dd
Merge pull request #893 from Kelenius/AIHud
...
AI hud
2016-02-26 20:31:40 -05:00
Datraen
0b4a730bbe
Merge pull request #1083 from Kelenius/plzNoCard
...
There is now a ten-second delay for carding the AI
2016-02-26 14:36:50 -05:00
Hubblenaut
6ee464cae7
Merge remote-tracking branch 'upstream/master' into cash
2016-02-26 13:48:01 +01:00
Kelenius
e40a2b59ab
There is now a ten-second delay for carding the AI
2016-02-26 11:02:53 +03:00
Datraen
47efe8d217
Gets rid of double emotes on pAIs and AIs.
2016-02-25 12:39:00 -05:00
Datraen
55a024ef14
Adds a mech flare launcher, can be mounted on any mech.
2016-02-24 21:15:48 -05:00
Hubblenaut
c22f9b2996
Merge remote-tracking branch 'upstream/master' into cash
2016-02-21 17:48:19 +01:00
Datraen
9d269ab470
Merge pull request #1033 from Yoshax/burnbabyburn
...
Allows lighting of smokeables on burning people
2016-02-21 11:32:16 -05:00
Datraen
f9054370c1
Merge pull request #1046 from Sabess/Sab_Thing
...
Maglights 2.0: Conflict Boogaloo
2016-02-21 11:30:34 -05:00
Hubblenaut
60f5358751
All cash now acts like bundles
2016-02-21 17:23:54 +01:00
PsiOmegaDelta
36c99aecae
Closet breakout no longer failes early.
...
Caused by req_breakout() always making us quit early if we're already breaking out.
Breakout sound/animation now play after the checks.
Fixes the secure locker break_open() override, which wouldn't update the welded flag and thus keep you imprisoned.
Fixes a couple of bad macros.
2016-02-21 13:57:03 +00:00
PsiOmegaDelta
afdafb3862
Makes the into-resist proc solely responsible for checking click delays.
...
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay.
Fixes #11839 . Fixes #12062 . Fixes #12114 .
2016-02-21 12:45:01 +00:00
sabess
71d8acc2cb
Fixed the damage again, oops.
2016-02-21 23:06:05 +11:00
sabess
cb1e26ec70
Fixed conflicts with another thing.
2016-02-21 22:48:56 +11:00
Neerti
93dd32f1b2
Merge pull request #1037 from Yoshax/dolladolla
...
Changes predefined space cash stacks to be bundles
2016-02-21 04:48:00 -05:00
Zuhayr
ebd2360f43
Merge pull request #1004 from Kelenius/master
...
Monkey cubes now expand in showers
2016-02-21 17:49:46 +10:30
Zuhayr
560e6a0ffc
Merge pull request #992 from Neerti/2/14/2016_ling_nerfs_and_ear_protection_cleanup
...
Ling nerfs, ear protection cleanup, and ling bugfixes.
2016-02-21 17:48:44 +10:30
Yoshax
76db1f5e6c
Changes predefined space cash stacks to be bundles
...
Fixes #926
2016-02-21 02:16:14 +00:00
Mark9013100
8b84695598
Z1/2 Fixes & Edits
2016-02-20 17:55:05 -05:00
Yoshax
23c3c58f25
Removes inappropriate message
2016-02-20 21:31:13 +00:00
Crazylemon64
6e261771db
Allows lighting of smokeables on burning people
2016-02-20 20:54:27 +00:00
Matt
c07dfe5372
Unlimited Welder Fix
...
Fixes a bug where welders are infinite use. With this, the Welder will not turn on unless it has at least 1u of welder fuel. Previously, it worked on 'not zero', which allowed it to weld endlessly with fractions of 1u inside (as it was not Zero, but could not deduct 1 from it when used).
2016-02-20 06:33:45 -05:00
Yoshax
46f2528481
Adds linoleum stack
2016-02-20 04:10:41 +00:00
Zuhayr
cbc506fd51
Removed xenomorphs.
2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
Kelenius
a5e4aa33d5
Monkey cubes now expand in showers
...
Port of https://github.com/Baystation12/Baystation12/pull/12107 and
https://github.com/Baystation12/Baystation12/pull/12183
2016-02-18 12:24:38 +03:00
