Datraen
f2e9601400
Fixes a check to blind if there is a lack of eyes. Broken eyes are already handled in their process.
2016-03-29 00:36:38 -04:00
redstryker
7a437e12f5
Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers.
2016-03-28 23:53:38 -04:00
Neerti
8bfac9c57a
Merge pull request #1206 from Hubblenaut/master
...
Adds wallets to loadout menu
2016-03-28 12:49:57 -04:00
Yoshax
db1a5021bc
Corrects error in a span ckass
2016-03-28 17:19:03 +01:00
Mark9013100
f95cbbdc4a
Ports /tg/'s armored trenchcoat sprite
2016-03-27 07:06:01 -04:00
Neerti
ddf4cceb96
Merge pull request #1260 from Datraen/BuckleResistFix
...
Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time.
2016-03-26 20:51:08 -04:00
Yoshax
d0d3d3cb16
Merge remote-tracking branch 'upstream/master' into morepreferences
2016-03-27 00:17:24 +00:00
Datraen
f8825f1752
Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time.
2016-03-26 18:33:46 -04:00
Neerti
36096643fc
Merge pull request #1244 from Mark9013100/3/24/2016combatjumpsuit
...
Adds sprites for the combat turtleneck
2016-03-26 17:02:21 -04:00
Neerti
13b255f43c
Merge pull request #1259 from Datraen/BayLifePick
...
Baystation12 Life Improvement Port
2016-03-26 17:01:55 -04:00
Datraen
ca2e45cc3e
Resolves conflicts with Baystation12/Baystation12#12276
2016-03-26 16:35:31 -04:00
Neerti
96e52f5af0
Merge pull request #1229 from SinTwo/construction_update
...
Construction update
2016-03-26 15:45:19 -04:00
Neerti
57b6fe7aa8
Merge pull request #1169 from Kelenius/fixesOnly
...
Axes old wire, fixes costs in lathe
2016-03-26 15:42:25 -04:00
Chinsky
98750f20ba
Removed some duplicated code for clearer readability.
...
Fixed cold air giving high temperature traces.
2016-03-26 15:41:27 -04:00
Chinsky
96fd04374a
Makes unused code use jitterness proc.
...
Fixes life assuming that if we don't have eyes, we never had em.
2016-03-26 15:41:25 -04:00
Chinsky
87395fd6c2
Shortens some wordy procs that used a lot of duplicate code with power of OOP
2016-03-26 15:40:36 -04:00
Neerti
655a7b08e2
Merge pull request #1258 from Datraen/PDAManifestFix
...
Removes JSON encoding of PDA Manifest list.
2016-03-26 15:38:32 -04:00
Neerti
30dadef6e9
Merge pull request #1255 from Anewbe/patch-1
...
Leg Guard fixes
2016-03-26 15:37:34 -04:00
Datraen
c09bb6d807
Removes JSON encoding of PDA Manifest list.
2016-03-26 15:31:08 -04:00
Datraen
357fd67a65
Merge pull request #1159 from Kelenius/playingWithTravis
...
Attempts to port bay's travis update attempts
2016-03-26 13:18:55 -04:00
Anewbe
d4f7a366d8
Leg Guard fixes
...
- Unathi and Taj should now be able to wear the leg armors
- The specialized leg armors should now have the appropriate armor values, rather than all sharing the one for laserproof
2016-03-25 22:14:41 -05:00
SinTwo
f0487bc6b4
Reagent Dispenser Update
2016-03-25 16:59:07 -04:00
SinTwo
b356f5cf21
Construction Update
2016-03-25 16:02:36 -04:00
Mark9013100
03d1fbcf10
Gives the QM a proper stamp
2016-03-24 14:52:55 -04:00
Neerti
faf538a832
Merge pull request #1246 from Datraen/XenoarchSpawnFix
...
Fixes a check in xenoarch master controller.
2016-03-24 12:17:07 -04:00
Datraen
4c9c5e5870
Fixes a check in xenoarch master controller.
2016-03-24 10:17:26 -04:00
Neerti
dfb6ea7071
Merge pull request #1241 from Mark9013100/3/23/2016magstorage
...
Armor can now hold maglights
2016-03-24 09:06:51 -04:00
Mark9013100
e87f19da39
Adds a sprite for the combat turtleneck
2016-03-24 03:22:53 -04:00
Neerti
b457b54b02
Merge pull request #1234 from Yoshax/IB
...
Fixes IB surgery not checking for open ribs etc
2016-03-23 20:42:48 -04:00
Neerti
3e45f9f727
Merge pull request #1235 from Yoshax/watercooler
...
Watercooler can be wrenched/unwrenched now
2016-03-23 20:28:12 -04:00
Mark9013100
5f734effbc
Armor can now hold maglights
2016-03-23 20:14:56 -04:00
Mark9013100
ce1e4bc33b
Capitalizes pill description.
2016-03-23 16:09:21 -04:00
Hubblenaut
677e18dbaf
Removes people being able to pull from somebody's grab
2016-03-23 18:29:41 +01:00
Kelenius
e883863f4b
Merge branch 'master' into playingWithTravis
2016-03-23 17:12:11 +03:00
Brian Cook
9edc1dd549
Watercooler can be wrenched/unwrenched now
...
Fixed capitalization in some cases
2016-03-23 13:13:54 +00:00
Chinsky
2ad91fc60c
Fixes IB surgery not checking for open ribs etc
...
Guess it wasn't updated after Zuh's encased changes
2016-03-23 13:08:08 +00:00
Mark9013100
e62863e1b3
Renames the security .45
2016-03-22 23:03:21 -04:00
Neerti
a9ad84da4b
Merge pull request #1191 from Kelenius/inventoryCleanup
...
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Neerti
9027b0f391
Merge pull request #1221 from Ithalan/master
...
Fixes Anomaly Analyzer reading the wrong variable for the artifact effect's range
2016-03-22 21:36:42 -04:00
Neerti
0891eba8cd
Merge pull request #1207 from Datraen/GTStationWide
...
Adds a check to the greytide virus to see if the APCs are operating.
2016-03-22 21:36:35 -04:00
Neerti
6c1187d3f7
Merge pull request #1228 from Yoshax/resomiblood
...
Make human vessels properly adjust capacity on species change
2016-03-22 21:33:24 -04:00
Yoshax
c7dd36a297
Make human vessels properly adjust capacity on species change
2016-03-22 22:45:39 +00:00
EmperorJon
aea690febf
Merge pull request #1222 from Datraen/XenoarchSpawnFix
...
[XENOARCH] Checks to see if the turf is a floor before spawning artifacts.
2016-03-22 22:34:52 +00:00
Datraen
fbbfb78dec
Merge pull request #1212 from Kelenius/feedMeLight
...
Fixes #1171 - ninja suit injects nutriment
2016-03-22 15:15:14 -04:00
Matt
61d2eb1d3e
Properly log dropper-related assault for admins
...
Fixes bug #1219
Moving the logging from post-dropping (when the dropper is empty) to Pre-drop, post-dropable check (it should not be located at the point when a drop is going to occur, but just prior to actually doing so).
As always, please review this change to make sure I didn't break anything. All I did was cut-paste the lines to a few lines above, but hey, never hurts to double-check!
2016-03-22 13:11:48 -04:00
PsiOmegaDelta
3d78390ce6
Adjusts preference defaults.
...
They are no longer affected by whether clients are allowed to toggle them.
2016-03-22 16:15:33 +00:00
PsiOmegaDelta
f3cde3af01
Both enabled and disabled preferences are now stored.
...
The purpose is to ensure that new preferences that are in neither list get the appropriate enabled/disabled setting without having to utilize the savefile update path.
Also attempts to optimize the acquirement of the preference mob.
2016-03-22 16:13:54 +00:00
Yoshax
78abc7f790
Fixes cherry picking errors
2016-03-22 16:07:58 +00:00
PsiOmegaDelta
ea579b2da6
Preferences now store client key instead of the client itself.
...
For reasons unbeknown to me, the client var is reset when the client logs outs and thus the preference mob cease to be.
Now stores the client key, and acquires the appropriate mob based on that, if possible.
Also removes the sanitation check because the holder isn't set before the preferences are created.
Fixes #12341 .
2016-03-22 16:04:16 +00:00
Datraen
b36edb0690
Merge pull request #1213 from Kelenius/topicTime
...
Removes topic limiter
2016-03-22 10:59:22 -04:00
