bdb79d262c
Missing line for malf AI robfactory
2013-09-06 14:26:27 -04:00
948565e845
Changing station name in global.dm
2013-09-06 13:10:50 -04:00
6f1015a4cd
Changing hub link
2013-09-06 13:08:04 -04:00
a784670e21
Lowering string count
2013-09-06 13:07:54 -04:00
ac0ddde997
Updated DB ban code
2013-09-06 08:58:57 -04:00
7ffdc68add
Adding /tg/'s laserpointers
2013-09-06 08:31:28 -04:00
df52b1c3fd
Merge branch 'master' of https://github.com/ZomgPonies/Baystation12
2013-09-06 08:03:24 -04:00
d342a1735c
People on DocCarts can pull rollerbeds
2013-09-06 08:03:18 -04:00
19d85cdf03
Merge pull request #7 from Kodos-Atoz/master
...
Update hypospray.dm
2013-09-06 04:56:48 -07:00
a841cff4bb
Update hypospray.dm
...
Changed starting CMO Hypo contents
2013-09-06 06:51:52 -05:00
372c4c9dcc
Re-adding code to allow ambulances to pull rollerbeds.
2013-09-06 06:45:50 -04:00
2d868b1b37
Merge branch 'master' of https://github.com/ZomgPonies/Baystation12
2013-09-06 06:42:31 -04:00
34820b915a
Civilian fix
2013-09-06 06:42:27 -04:00
4e7b8599e3
Merge pull request #6 from Kodos-Atoz/master
...
Added Job Alt-Titles
2013-09-06 03:07:04 -07:00
f848c5c4d6
Update civilian.dm
2013-09-06 04:41:25 -05:00
3bdb2a5b00
Update civilian.dm
...
Added Job Titles
2013-09-06 04:39:41 -05:00
27b4205f03
Update civilian_chaplain.dm
...
Added misc Job Titles
2013-09-06 04:31:22 -05:00
7ff012a58a
Female Clowns/Mimes get their own clothes
2013-09-06 05:30:44 -04:00
7dbddd9835
Update medical.dm
...
Added misc job titles
2013-09-06 04:18:29 -05:00
6a185497ef
Tests to get the DB connection working
2013-09-05 16:23:17 -04:00
21840e1053
Missing line to re-add ponies. Ponies. Wheee.
2013-09-05 14:45:12 -04:00
ed8714550c
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master
...
Conflicts:
config/example/config.txt
config/example/motd.txt
config/example/rules.html
2013-09-05 13:29:34 -04:00
081356f21b
Fixes longstanding connection bug.
2013-09-03 20:58:26 -07:00
94fc06d0df
Temporary fix for ZAS processing twice per time interval.
2013-09-03 00:41:46 -07:00
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
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
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
2454d72233
Merge pull request #3620 from Segrain/master
...
Bugfix.
2013-08-31 08:07:26 -07:00
7dae19a3f9
Fix for #3498 .
2013-08-30 04:40:39 +03:00
a7f1b50f1b
Fixes reagent and throw logging.
2013-08-30 00:38:10 +01:00
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
8d1fdd87b3
Typecheck fix.
2013-08-29 02:24:40 +03:00
3762fcc4a8
Merge pull request #3610 from Mloc/master
...
Space no longer freezes mobs.
2013-08-28 10:48:57 -07:00
9fed22c056
Space no longer freezes mobs.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-28 18:49:00 +01:00
208ef684ad
Merge pull request #3603 from Erthilo/master
...
Fixes Thermite
2013-08-28 06:06:54 -07:00
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
8ee601aa9a
Fixes thermite runtimes.
2013-08-28 13:27:07 +01:00
3557e12943
Suits with shoes protect against glass shards.
2013-08-28 12:49:23 +01:00
fa36451ec5
Merge pull request #3593 from Segrain/master
...
Helper fix.
2013-08-27 19:50:46 -07:00
00c4859765
Merge pull request #3598 from zylowalsh/Door_Control-Fix
...
Update door_control.dm
2013-08-27 19:50:22 -07:00
0cb361f737
Removed undeeded "ATTACK:"
2013-08-28 03:37:11 +01:00
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
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
7a319904e4
Reverts gender checks as it was breaking with NEUTER and breaking facial hair.
2013-08-27 22:51:24 +01:00
19db0df4b5
Fix for hiding cyborgs from upload console.
2013-08-27 19:50:35 +03:00
e85ddd3b9a
Fix for unisex hairstyles.
2013-08-25 09:27:05 +03:00
88cd7f1577
Makes windows and grilles garbage collect.
2013-08-25 02:01:00 -04:00
a5f79057d1
Merge pull request #3585 from Segrain/master
...
Hairfix.
2013-08-24 22:50:36 -07:00
86d709e150
Fixed medical HUDs not being able to set SSD status correctly
2013-08-24 23:52:00 -04:00
901ee82c75
Merge branch 'master' of https://github.com/ZomgPonies/Baystation12
2013-08-25 01:34:40 +04:00
ZomgPonies