Commit Graph

10699 Commits

Author SHA1 Message Date
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
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
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
SkyMarshal
081356f21b Fixes longstanding connection bug. 2013-09-03 20:58:26 -07:00
SkyMarshal
94fc06d0df Temporary fix for ZAS processing twice per time interval. 2013-09-03 00:41:46 -07:00
Mloc-Argent
72d158143b Previous commit apparently got swallowed by the git monster.
Turns off auto FILE_DIR in .dme, fixes compile error.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-02 21:50:58 +01:00
ZipIce
497b050488 Update disease.dm
This will remove some run-time errors, allowing disease to work when the mob has no reagents (new players and simple animals).
2013-09-01 23:42:35 -07:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Mloc
2454d72233 Merge pull request #3620 from Segrain/master
Bugfix.
2013-08-31 08:07:26 -07:00
Segrain
7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Mloc-Argent
d2d08208a8 made zburn/firelevel more predictable. Probably won't change much ingame, but it's a start.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-29 22:06:27 +01:00
Zuhayr
b6912d292c Added light to previous commit. 2013-08-29 03:38:52 -07:00
Zuhayr
3e13680498 Tajaran hardsuit code. 2013-08-29 03:11:55 -07:00
Zuhayr
e7d7a63177 Type of unathi breacher fixed. 2013-08-29 00:42:40 -07:00
Zuhayr
99b57c1a8e Skrell suit sprite fix, oops. 2013-08-29 00:41:47 -07:00
Zuhayr
5f1f54f296 Forgot an exclude. 2013-08-29 00:39:13 -07:00
Zuhayr
36fa588df5 Unrestricted sandals, clown shoes, galoshes. 2013-08-29 00:38:00 -07:00
Zuhayr
fb7ca1348c Added species restrictions to hardsuits, shoes, helmets. Added Skrellian hardsuits and helmets. 2013-08-29 00:35:41 -07:00
Zuhayr
f378dfa350 Species type check for clothing adjustment. 2013-08-29 00:03:16 -07:00
Zuhayr
dabd0866a2 As above. 2013-08-28 23:34:12 -07:00
Zuhayr
1b41e4a582 Security item fixes, sprite fixes. 2013-08-28 23:33:46 -07:00
Zuhayr
3f3c0f80bb Type path fix. 2013-08-28 22:55:03 -07:00
Zuhayr
c17347ef77 Added CubeJackal's security gear to the appropriate lockers. 2013-08-28 22:31:22 -07:00
Zuhayr
05e223d248 Minor fix for previous commit. 2013-08-28 22:28:31 -07:00
Zuhayr
f1f0a3e340 Added species_restricted list to clothing, added check for equipping clothing with species_restricted set. Only species on the list can equip the gear, if the equipper is human. 2013-08-28 22:17:40 -07:00
Zuhayr
93011399f0 CubeJackal's new sec uniforms. 2013-08-28 21:18:14 -07:00
Zuhayr
0dba5c14b4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-28 20:40:19 -07:00
Segrain
8d1fdd87b3 Typecheck fix. 2013-08-29 02:24:40 +03:00
Zuhayr
3762fcc4a8 Merge pull request #3610 from Mloc/master
Space no longer freezes mobs.
2013-08-28 10:48:57 -07:00
Mloc-Argent
9fed22c056 Space no longer freezes mobs.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-28 18:49:00 +01:00
Mloc
208ef684ad Merge pull request #3603 from Erthilo/master
Fixes Thermite
2013-08-28 06:06:54 -07:00
Mloc
489e037bcd Merge pull request #3599 from Erthilo/master
Logs, lots and lots of logging, glass shards and suits, Prison button
2013-08-28 05:37:01 -07:00
Erthilo
8ee601aa9a Fixes thermite runtimes. 2013-08-28 13:27:07 +01:00
Erthilo
3557e12943 Suits with shoes protect against glass shards. 2013-08-28 12:49:23 +01:00
Zuhayr
fa36451ec5 Merge pull request #3593 from Segrain/master
Helper fix.
2013-08-27 19:50:46 -07:00
Zuhayr
00c4859765 Merge pull request #3598 from zylowalsh/Door_Control-Fix
Update door_control.dm
2013-08-27 19:50:22 -07:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Philip
66071c81ba Update door_control.dm
The var desiredstate doesn't update when the airlock closes automatically and so most of the time players have to hit the button twice. This keeps all functionality but with one button press.
2013-08-27 16:38:07 -06:00
Erthilo
7a319904e4 Reverts gender checks as it was breaking with NEUTER and breaking facial hair. 2013-08-27 22:51:24 +01:00