Commit Graph

6587 Commits

Author SHA1 Message Date
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
EmperorJon
a3652eacc6 Merge pull request #1398 from Neerti/4/11/2016_slowdown_fixes_and_stealth_nerfs
Slowdown Fix
2016-04-13 17:31:07 +01:00
PsiOmegaDelta
4286cd959e Resist tweaks.
Can now resist out of handcuffs and buckle restraints. Fixes #12359.
No longer resist out of every possible type of restraint at the same time.

# Conflicts:
#	code/modules/mob/living/carbon/resist.dm
2016-04-12 02:01:50 +01:00
Neerti
10e2683955 Slowdown Fix
Slowdown is now correctly applied for objects intended to have slowdown, for example Dufflebags and Arm Guards, as many more slots are checked for slowdown instead of just the suit and shoe slots.  Slots checked are now suit, uniform, back, gloves, head, suit storage, and the left and right hands.
2016-04-11 05:02:47 -04:00
Datraen
9c21e0bcdc Manually ports /tg/'s darkclick code.
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
2016-04-08 23:07:10 -04:00
Neerti
469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
woodratt
1f3556316d 1.4.9 Hotfix
- Phoron tank in atmos brought back into OSHA non-compliance
- Extra table in the starboard aid station removed.
- Missing air alarms in visitor rooms added.
- Derelict shop area updated.
- Manhack grenade fixed for heist.
- Two of the three spike throwers removed.
- Three new "hair" styles added for Teshari, fixed one broken one.
- Toxins mixing chamber now starts airless.
- Framework in place to allow for a custom item (white cane)
- Fixed access restrictions on riot control maintenance door.
- Firelock added to CE's office door. Entryway from the CE's office to the monitoring room added.
- Fixed a camera in the detective's office.
- Anchored the exonet node on T-comms.
- Fixed Dufflebag in hand sprites.
2016-04-02 15:44:37 -07:00
EmperorJon
7930557e01 Merge pull request #1314 from Neerti/3/31/2016_research_borg_fix
Fixes Research Module's Analyzer
2016-04-01 19:09:38 +01:00
Atlantis
b239cf4b19 Adds synthetics to the crew manifest
- Synthetics now show on the crew manifest properly. This might as well be a bug fix since they already had the category, it just didn't work at all, since they don't have official security/medical/employment records.
- This does not mean synthetics are part of crew. They just show on the crew manifest for the sake of knowing who is in game when you are joining. I often saw people join a specific position, only to see that all work has already been done by a cyborg.
- As a note, Syndicate/Combat module cyborgs don't show on the manifest. Emagged cyborgs do show, however.
- This does not (probably) support the PDA manifest (which is currently broken anyway)
- Example screenshot: http://i.imgur.com/RSPuuom.png

🆑
rscadd: Cyborgs and the AI now show on the crew manifest.
:/cl:
2016-03-31 17:25:28 -04:00
Daranz
2482ddf55a Resolve problem with robot destructive analyzer
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.

Resolves #12356
2016-03-31 16:10:07 -04:00
Kelenius
6d76aa3966 Fixes #945 - monkeys can't ventcrawl
Ventcrawl will now tell you which items prevent you from crawling if it
fails due to that
2016-03-31 18:12:30 +03:00
EmperorJon
2bb4f43166 Merge pull request #1237 from Hubblenaut/grabpull
Removes people being able to pull from somebody's grab
2016-03-30 15:07:25 +01:00
Neerti
a9b2e7a61e Merge pull request #1133 from Kelenius/coolBots
Overhauls bot AI
2016-03-30 02:23:28 -04:00
Yoshax
c1e69fd8a3 Adds a missing ! 2016-03-29 23:55:27 +01:00
Datraen
3809e92adf Merge pull request #1214 from Yoshax/morepreferences
Makes it possible to have more than 16 preferences
2016-03-29 14:44:47 -04:00
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
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
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
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
Datraen
c09bb6d807 Removes JSON encoding of PDA Manifest list. 2016-03-26 15:31:08 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -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
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Yoshax
c7dd36a297 Make human vessels properly adjust capacity on species change 2016-03-22 22:45:39 +00:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Kelenius
f2a504d822 Merge branch 'master' into plzNoFat 2016-03-18 21:38:34 +03:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius
bc1bbafaad new_player: absolute pathing 2016-03-17 16:35:09 +03:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Yoshax
5cc4b397fe Adds new hair, ported from bay 2016-03-14 22:34:18 +00:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
Datraen
1b40fb3bfe Traitor Borg lockdown, blowing-up fixed; can now self-hack. 2016-03-12 17:03:28 -05:00
EmperorJon
27842e182e Merge pull request #1166 from Yoshax/splitundie
Splits underwear into top underwear and bottom underwear
2016-03-12 19:30:38 +00:00
Kelenius
89ff4f5fc3 Adds ..() to /obj/structure/New() 2016-03-12 14:13:13 +03: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
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Kelenius
069a2e52a9 Fixes #1145
Restores 'AI IM' verb tab
2016-03-10 10:30:07 +03:00
Datraen
be4564d30e Merge pull request #1128 from Hubblenaut/cash
Retail Scanner, Fixes and QOL
2016-03-08 16:40:02 -05:00
Kelenius
0b71767b0f Finalizes bot updates 2016-03-08 12:55:42 +03:00
Kelenius
e8df17ccad WIP - cleans up bots
Fixes farmbot getting stuck
Floorbots fix asteroid
2016-03-08 11:13:34 +03:00
Hubblenaut
0a85f0c0fa Retail Scanner QOL
Adjusts Size to fit in pocket
Fits in belt slot
Adds technology level for deconstructor (MT 1)
Ability to swipe when shown by show_held_item
2016-03-07 19:50:49 +01:00