Fox-McCloud
ea119a98df
Merge pull request #1811 from Markolie/DENIED
...
Add option to reject adminhelps
2015-08-22 16:06:58 -04:00
Fox-McCloud
c65f47707b
Merge pull request #1807 from Markolie/globalassetcache
...
Update start of game logging, add global asset cache
2015-08-22 16:06:04 -04:00
Fox-McCloud
76d1493601
Merge pull request #1825 from Markolie/admins
...
Readmin fix, antag age update
2015-08-22 16:03:42 -04:00
Markolie
e2246d40c5
Missing comma
2015-08-22 21:55:54 +02:00
Markolie
8ffea8f731
Readmin fix, antag age update
2015-08-22 21:53:51 +02:00
TheDZD
89b34aae2c
Merge pull request #1824 from tigercat2000/readable_sql
...
Make mysql save queries readable
2015-08-22 14:54:43 -04:00
Tigercat2000
a1d4358af7
Make mysql save queries readable
2015-08-22 08:49:42 -07:00
Fox-McCloud
03e9b2fa1c
Merge pull request #1802 from TheDZD/touch-spell
...
Wizard Touch Attacks and Staff Fixes
2015-08-21 23:01:02 -04:00
Mark van Alphen
f50ba2cd6b
Merge pull request #1820 from Aurorablade/SecRecordText
...
[Text Edit] Crime is not a Disability
2015-08-22 02:16:34 +02:00
Aurorablade
2ad7168c6c
changes disabilty to crimes
2015-08-21 20:08:32 -04:00
Markolie
557c78c1c0
Remove double follow link
2015-08-22 01:14:10 +02:00
DZD
0965789925
Fix merge conflicts
2015-08-21 18:38:42 -04:00
Fox-McCloud
64af990d63
Merge pull request #1806 from Markolie/nukegoesboom
...
Nuke update
2015-08-21 16:56:30 -04:00
Fox-McCloud
e3318d5a29
Merge pull request #1804 from Markolie/ertb
...
ERT backpack update
2015-08-21 16:54:08 -04:00
Markolie
9dfdd2932c
Fix typo
2015-08-21 18:53:04 +02:00
Markolie
aa9b5a6310
Implement /vg/'s global asset cache
2015-08-21 18:47:00 +02:00
Mark van Alphen
f70f75704d
Merge pull request #1796 from Fox-McCloud/detective-scanner
...
Detective Scanner Protolathe Production
2015-08-21 17:19:06 +02:00
Mark van Alphen
4e619f1e36
Merge pull request #1793 from Alex6511/master
...
Makes NT less awful
2015-08-21 17:18:53 +02:00
Alex6511
45f6e2d34a
Update event_container.dm
2015-08-20 19:48:02 -04:00
Alex6511
b70c46a3a4
Merge pull request #1 from Alex6511/Borer-Removal
...
Removes borer random event
2015-08-20 19:46:33 -04:00
Alex6511
481b13b32e
Update event_container.dm
2015-08-20 19:46:05 -04:00
Mark van Alphen
34cc6b6278
Merge pull request #1810 from Spacemanspark/master
...
Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)
2015-08-20 23:33:27 +02:00
Markolie
e6c331153a
Add option to reject adminhelps
2015-08-20 23:33:09 +02:00
Spacemanspark
8d691a2944
Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)
...
Tully is a nerd.
2015-08-20 16:17:38 -05:00
Markolie
fa55bc85f8
Baystation --> This server
2015-08-20 22:37:41 +02:00
Markolie
f6c8358fa2
Fix reference to nuke
2015-08-20 21:57:41 +02:00
Markolie
175bea62ca
only change alert level on non-syndi nukes
2015-08-20 21:25:07 +02:00
TheDZD
a4ec672e6b
Merge pull request #1809 from Markolie/master
...
Another dsay fix
2015-08-20 15:18:12 -04:00
Markolie
eb2d2b6df9
Another dsay fix
2015-08-20 21:13:17 +02:00
TheDZD
3e50220b6f
Merge pull request #1808 from Markolie/master
...
dsay fix
2015-08-20 15:04:18 -04:00
Markolie
d556608225
dsay fix
2015-08-20 20:58:54 +02:00
Markolie
ebe275a8a1
log_to_dd instead of world.log
2015-08-20 20:22:54 +02:00
Markolie
6c8efe9a9b
Atmos --> Atmospherics
2015-08-20 20:08:58 +02:00
Markolie
4a0e02c4a8
Update start of game logging
2015-08-20 19:54:13 +02:00
Markolie
93e320c648
Add mob sprites to ERT backpacks
2015-08-20 19:33:35 +02:00
Markolie
4bd4452086
More nuke updates
2015-08-20 19:21:46 +02:00
Markolie
59a86e5711
Make nuclear bomb use wires datum
2015-08-20 18:47:19 +02:00
TheDZD
639478ace5
Merge pull request #1777 from Markolie/malf
...
Malf AI update
2015-08-20 11:50:19 -04:00
TheDZD
0c31d41e78
Merge pull request #1792 from Markolie/nano
...
NanoUI pod tracker/exosuit console, uplink fix
2015-08-20 11:50:14 -04:00
Mark van Alphen
9e80598119
Merge pull request #1805 from TheDZD/shadowling-fix
...
Shadowling Dethrall Fix
2015-08-20 17:50:04 +02:00
DZD
5205f55085
Shadowling dethrall fix
...
Should fix thralls not getting their spells removed upon dethralling.
2015-08-20 11:42:09 -04:00
TheDZD
9cf1177d27
Merge pull request #1803 from Markolie/ERT
...
isNonCrewAntag() checks, key_name fixes
2015-08-20 11:41:40 -04:00
Markolie
1e5d0ef4c8
Fix compile
2015-08-20 17:31:49 +02:00
Markolie
c92e224c34
ERT backpack update
2015-08-20 17:28:39 +02:00
Markolie
87570fc080
isNonCrewAntag() checks, key_name fixes
2015-08-20 17:25:55 +02:00
DZD
f3970fb304
Wizard touch attacks and fixes
...
- Flesh to Stone and Disintegrate are now actual touch attacks.
- Fixes issue with in-hands and back sprites missing for the staff of
animation.
- Fixes missing right-handed in-hand for the staff of healing.
2015-08-20 10:21:45 -04:00
Markolie
286d2301f4
Replace disabling RCD's with exploding them
2015-08-20 01:29:23 +02:00
Markolie
52a99468f1
Remove stray light switch in mime's office
2015-08-20 00:59:53 +02:00
Fox-McCloud
d623c97741
Detective Scanner Protolathe Production
2015-08-19 18:16:52 -04:00
Fox-McCloud
f89af99858
Merge pull request #1790 from Markolie/hosgun
...
Rename the head of security's energy gun
2015-08-19 17:05:17 -04:00
Fox-McCloud