Commit Graph

11004 Commits

Author SHA1 Message Date
Segrain
10150208d1 Fix for #3668. 2013-09-13 19:22:31 +03:00
Chinsky
c5c65c2f25 Merge pull request #3673 from LethalGhost/patch-1
Fix for stool picking up.
2013-09-12 22:51:38 -07:00
Mark Aherne (Faerdan)
9378ce2402 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-12 20:58:06 +01:00
Mark Aherne (Faerdan)
231387776b Split dna.dm into three files to make it easier to browse the code.
This is a pre-cursor to my DNA Modifier rewrite using Nano UI.
2013-09-12 20:55:10 +01:00
Lethal Ghost
09dc90c46b Fix for stool picking up. 2013-09-13 00:23:16 +06:00
meyar
2dd7fe538b Derp, deleted airlock access. MY B. 2013-09-12 13:49:49 -04:00
meyar
ef4defdae0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-12 13:16:46 -04:00
meyar
3d6b510395 Restores a magically lost (again) feature. Traitor ID cards being reforgable. 2013-09-12 13:14:57 -04:00
Chinsky
b73d92c4f4 Merge pull request #3669 from SkyMarshal/airfixes
Zones can now sleep, multi-tile firedoors are sprited, and gas masks no longer have their fingers in gas mixture code...
2013-09-12 00:13:45 -07:00
Chinsky
5e8a1278aa Merge pull request #3670 from Faerdan/dev
Nano UI Updates
2013-09-12 00:11:39 -07:00
jack-fractal
474f44645d Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-12 00:10:12 -04:00
jack-fractal
e73c06e51c Fixing a bug in the cyborg taser that caused it to continue draining cell-power from the cyborg even after it had finished recharging. 2013-09-11 23:33:23 -04:00
Kilakk
02c8ae13cc Fixes #3668, added detection for known implants to the med scanner
doesn't include explosive implants, etc.
2013-09-11 21:47:29 -04:00
Mark Aherne (Faerdan)
2e957c8b51 Updated the documentation for the ui_interact proc.
Moved the client nanoclose verb into nanoexternal.dm.

Removed debug comments.
2013-09-11 22:24:21 +01:00
Mark Aherne (Faerdan)
762baa490f Better documentation for the ui_interact proc. 2013-09-11 21:46:59 +01:00
Mark Aherne (Faerdan)
8a6094685a Minor fixes. Added Templates Guide (wip). 2013-09-11 21:27:54 +01:00
SkyMarshal
92f389546b Removes the gas mask filtering stuff from gas mixtures. Moved it into the relevant "life" code. 2013-09-11 12:09:23 -07:00
SkyMarshal
add3ed71c0 Added new two-tile hazard door sprites, thanks to Ravensdale, and fixed a derp with the new ZAS sleeping stuff. 2013-09-11 11:43:42 -07:00
SkyMarshal
f76f5ae532 First pass on experimental change that allows zones to "Sleep" 2013-09-11 11:43:42 -07:00
Mark Aherne (Faerdan)
447f0a2fe7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-09 22:43:09 +01:00
Mark Aherne (Faerdan)
901a3dae8e Documented Nano code. 2013-09-09 22:32:59 +01:00
Zuhayr
ca5036fd71 Wirecutter use on gloves will remove Tajaran and Unathi restrictions. 2013-09-10 00:15:37 -07:00
Zuhayr
8869718963 Customisation kits for Taj engineers. 2013-09-09 23:35:50 -07:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Zuhayr
161ec9ab98 Minor language token fix. 2013-09-09 21:52:23 -07:00
Zuhayr
f8d40ab907 Fixes some Skrell hardsuit issues. 2013-09-09 21:51:15 -07:00
Zuhayr
55865f7b1e Added key to Check Languages. 2013-09-09 21:51:04 -07:00
Zuhayr
a5234383e1 Check Language verb. 2013-09-09 21:50:52 -07:00
Kilakk
0e08e80bb0 Changed syringes and vials to work correctly with the autolathe 2013-09-08 14:24:06 -04:00
Kilakk
eb19112ab4 Added vials, syringes, and proximity sensors to the autolathe 2013-09-08 14:23:20 -04:00
Zuhayr
c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes
ZAS update, needs testing.
2013-09-07 05:46:04 -07:00
SkyMarshal
9c87960852 Bluh. 2013-09-06 21:11:46 -07:00
SkyMarshal
301de25bae Fixes the not-considering-actual-geometry issue. 2013-09-06 21:07:34 -07:00
SkyMarshal
7d0c1f047a There we go, rebuilding works right now. Also has a slightly bugged verb that demonstrates how the rebuilding works, but you need to somehow prevent a zone from updating for it to show more than one "id" 2013-09-06 21:03:46 -07:00
SkyMarshal
1762c65640 man I am bad at this 2013-09-06 19:57:55 -07:00
SkyMarshal
057c8eeacd Fixed a minor derp. 2013-09-06 19:46:48 -07:00
SkyMarshal
5eb87a8b13 Use of two-pass connected component labeling to improve zone rebuilding
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2013-09-06 19:10:29 -07:00
SkyMarshal
3b2da3238c Reduces processing of connections, zones now rely on the air properties of constituent turfs (they will adjust these properties when turfs are added or removed) 2013-09-06 15:41:50 -07:00
Chinsky
cafa176548 Merge pull request #3647 from SkyMarshal/patch-2
ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
2013-09-04 07:20:15 -07:00
SkyMarshal
99bf9db04c Fixes lastertag guns killing you if you stick it in your mouth. 2013-09-03 22:51:37 -07:00
Zuhayr
b0d7a95189 Merge pull request #3644 from DJSnapshot/master
Gave mods dsay command and unique dsay identifier
2013-09-03 22:46:39 -07:00
SkyMarshal
081356f21b Fixes longstanding connection bug. 2013-09-03 20:58:26 -07:00
SkyMarshal
e8f9d19c75 Completed ZAS rework. Needs testing, and consideration to make zones sleep. 2013-09-03 20:25:03 -07:00
SkyMarshal
073f462e1b WIP ZAS rework. 2013-09-03 20:25:02 -07:00
DJSnapshot
2c41ad1429 Gave Mods dsay command and unique dsay identifier 2013-09-03 14:10:21 -07:00
Zuhayr
24764131af Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-03 23:46:18 -07:00
Zuhayr
1b6d76f004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-09-03 23:46:04 -07:00
Zuhayr
3019942102 Minor language token fix. 2013-09-03 23:40:07 -07:00
Zuhayr
4e9e8e0e3d Fixes some Skrell hardsuit issues. 2013-09-03 23:38:46 -07:00
SkyMarshal
94fc06d0df Temporary fix for ZAS processing twice per time interval. 2013-09-03 00:41:46 -07:00