Whitellama
6d8654eb7a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-30 20:02:36 -07:00
Zuhayr
304be1fe41
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-27 07:27:38 -07:00
Whitellama
90eaca1e53
WIP Ninja GM junk
2013-06-26 16:30:24 -07:00
Zuhayr
6d46297757
Fixes #2947
2013-06-27 07:17:55 -07:00
Zuhayr
3c7bd1f527
Dartgun tweaks and vox raider spawn equipment changes.
2013-06-26 00:00:55 -07:00
Zuhayr
a0aa02b815
Fixes broken vox raid spawning, hopefully.
2013-06-25 22:15:32 -07:00
Jim "Apples"
8b50deb13f
Merge pull request #3054 from comma/manup
...
Manup
2013-06-19 09:55:22 -07:00
Zuhayr
5c15ce687c
SHUT UP SPAMCAT. Bow fix, vox raider message fix.
2013-06-15 14:18:40 -07:00
Zuhayr
b1cac56e9a
Merge resolution.
2013-06-15 03:54:22 -07:00
Zuhayr
04be69a0b4
Magboots and gloves for vox, removed a debug string, tweaked vox.
2013-06-14 20:07:16 -07:00
Zuhayr
e3acd6e728
Minor tweak to previous commit.
2013-06-14 16:38:36 -07:00
Zuhayr
1e1426fa8a
Minor vox sprite fix, added vox to Create Admin verb.
2013-06-14 16:36:55 -07:00
NicholasDV
a2fddc0fc1
Adds in the Kida
...
Adds in the Kida Race to all parts.
2013-06-13 18:22:05 -04:00
Chinsky
634cf4e35f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into manup
...
Conflicts:
code/modules/admin/admin_verbs.dm
2013-06-12 23:25:15 +04:00
Zuhayr
fa79834e1b
Merge resolution.
2013-06-12 20:31:29 -07:00
Zuhayr
6bd685bcb2
Compilation fix for ERT code.
2013-06-12 12:30:28 -07:00
meyar
811fae38fd
Missed a line
2013-06-11 16:58:48 -04:00
meyar
7256c9d39f
Changes 'Emergency Rescue Team' to its proper 'Emergency Rescue Team'
2013-06-11 16:52:36 -04:00
MisterBook
b51bc5e322
Response Team still isn't ticked on. Dunno if it's ready. Re-re-uncommented.
2013-06-09 14:26:34 -05:00
Kilakk
5ca6c970fb
Reticked and uncommented ERT
...
It's time
2013-06-08 18:52:41 -04:00
Chinsky
3f39d92e8a
Added new admin verb: Man Up and its global version.
...
In action:
https://dl.dropboxusercontent.com/u/70048025/SS13/manup.png
https://dl.dropboxusercontent.com/u/70048025/SS13/manup_g.png
2013-06-08 09:51:47 +04:00
MisterBook
99e2afb6bc
Response team is unticked? Dunno if it's ready or not, but will not commit while that verb is live.
2013-06-07 12:45:02 -05:00
Kilakk
d1faeac8d8
Adds emergency response team verb
...
* Adds a verb for (b)admins in "Special Verbs" that lets you spawn in an
emergency response team a la deathsquid-button
* Spawned-in ERTs can choose their own ridiculous name
* Command alerts, because everyone loves those
2013-06-06 17:04:49 -04:00
Zuhayr
06f04e6374
Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.
2013-06-05 17:35:38 +09:30
cib
e4b610207b
Make debug log accessible to mods and coders.
2013-05-18 11:34:00 +02:00
cib
0da9a4538e
New debug log system.
...
You can as admin toggle debug messages, VERY useful for devs and debugging the main server.
2013-05-18 10:02:37 +02:00
Mloc
98a12ad82b
Fixed up BrokenInHands a little.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-05-16 13:05:23 +01:00
Mloc
566454b4c2
gave debuggers proccall back
2013-05-16 12:35:59 +02:00
SkyMarshal
697ab3dd7f
Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card
2013-05-11 03:39:31 -07:00
Mloc-Argent
27759f47df
Merged master into BEF.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-05-06 15:43:50 +01:00
Cael_Aislinn
bfdeeb4f94
resolved a MySQL statement issue
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-05-03 13:21:44 +10:00
Asanadas
f03da6fb94
Spelling fix for a button only admins ever see.
2013-04-24 17:20:43 -04:00
SkyMarshal
ef38bc91bf
Fixed some bugs with ZAS closed connections
...
Sped up air equalization between zones
Fixed an issue where space tiles were not removed from the zone.
Made ZAS debug functions accessible when the mapping verbs are toggled on.
2013-04-18 12:10:20 -07:00
SkyMarshal
b0d1d47c23
Fixes lighting, backpacks getting contaminated, and bombs not working.
2013-04-18 09:58:37 -07:00
SkyMarshal
5c5b7028b0
Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf.
2013-04-18 09:56:51 -07:00
SkyMarshal
698e7af57c
Fixes lighting, backpacks getting contaminated, and bombs not working.
2013-04-17 22:07:41 -07:00
SkyMarshal
b1e9955ea7
Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf.
2013-04-11 11:21:46 -07:00
Cael_Aislinn
30a34bbc9f
added an admin proc to check for any inactive players with custom items
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-01 19:15:27 +10:00
Gamerofthegame
f3ba4e4ec6
Opens the ERT debug-command preset for actual use.
2013-02-26 21:25:48 -05:00
Cael_Aislinn
fed198964f
fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.>
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-25 13:45:13 +10:00
Zuhayr
1fe4cbb619
Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed.
2013-02-20 00:24:26 -08:00
Gamerofthegame
437cca538b
Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze
2013-02-18 00:07:40 -05:00
Cael_Aislinn
2b4827692c
tweakfixes to admin PMs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-18 13:06:07 +10:00
Gamerofthegame
64c72ef969
Adds the ERT to the debug command for adminnery. Not exactly like the pre-merge one, as that was based off something else so I couldn't copy-paste. It should give admins a easier time of making things up, though, and so long as future plans go into effect a admin ought to be able to do it on the fly in less then a minute.
2013-02-17 18:15:07 -05:00
Cael_Aislinn
e6e4b89819
disabled simultaneous admin PM warning
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 17:49:48 +10:00
Cael_Aislinn
f29c19e52c
added global PM visibility for mods
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-11 02:51:55 +10:00
Cael_Aislinn
c05b9869e6
restructured/cleaned up how admin-pms are sent (retained original code just in case), made it so that only holders with R_ADMIN can see private messages, added a timeout warning to anyone PMing a player so they dont get spammed (default to 5 seconds, config edited)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:29:02 +10:00
Cael_Aislinn
0ad89c7953
removed moderators from adminwho, added new globally accessible verb to show online moderators
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:25:29 +10:00
Cael_Aislinn
15bc6ed7b2
restructured event system, re-merged CIB's event system with TG's
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:24:31 +10:00
Chinsky
6b10b8a564
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-02-09 23:57:10 +04:00