Commit Graph

1535 Commits

Author SHA1 Message Date
Erthilo
88a45d3cbf Job whitelist fix. 2013-09-02 17:51:49 +01: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
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
2013-08-31 17:45:31 +01:00
Mloc
15b0fc24a3 Merge pull request #3611 from Erthilo/dev
Medical tweaks, fixes, admin secrets
2013-08-29 03:51:09 -07:00
Erthilo
c483d58e34 Renabled admin secrets, as they are are admin only. 2013-08-28 19:44:02 +01:00
Mloc
4d928843b1 Merge pull request #3609 from Zuhayr/dev
Stuff from dev-freeze.
2013-08-28 10:40:58 -07: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
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Erthilo
1fd0522276 Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better. 2013-08-27 14:24:12 +01:00
Zuhayr
799c2fc94c Made Vox uncloneable. 2013-08-27 00:12:48 -07:00
Zuhayr
493dded8fb Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-22 15:29:59 -07:00
Erthilo
d3775875df Revert "Experimentally readding Delete Book verb."
This reverts commit ec3000ecfb.
2013-08-21 09:10:21 +01:00
Erthilo
b6900d50fc Fixes admins not spawning as aliens on roundstart. 2013-08-20 14:20:33 +01:00
Erthilo
ec3000ecfb Experimentally readding Delete Book verb. 2013-08-20 10:37:57 +01:00
Zuhayr
839546d173 Added new armour to raider generation proc. 2013-08-19 19:05:32 -07:00
Kilakk
6d2cd82a14 Added a fax machine to send messages to centcom with.
* Formatting can be seen by admins
* HTML tags can be used in replies
* Replies are sent directly to the fax machine and have a fancy stamp on them
* Currently uses access_lawyer but this might change
2013-08-18 14:39:08 -04:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change.
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-13 13:10:09 +01:00
Zuhayr
b10fe26a9e Typo fix. 2013-08-13 15:18:45 -07:00
Zuhayr
b131d22717 Fixes Check Antagonists for Heist mode. 2013-08-13 14:26:39 -07:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Zuhayr
a8c892a938 Fixes Heist check_antag verb. 2013-08-11 14:03:46 -07:00
Segrain
950029dc4a Moving box out of wrong slot. 2013-08-09 07:08:10 +03:00
Zuhayr
b5d89b8929 Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn. 2013-08-07 01:16:38 -07:00
Mloc-Argent
cf193b4893 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2013-08-05 22:53:25 +01:00
Mloc-Argent
c0490ca81d String cleanup.
Removes VOX announcement system.
Cleans up a small amount of admin HTML procs.
Cleans tags off of the map.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-05 22:52:10 +01:00
Zuhayr
98bbb095ad Swapped languages and datums over to global lists. Updated verbs. 2013-08-05 20:34:38 -07:00
Zuhayr
b875ff021b Vast array of changes to replace mutantrace with species datum 2013-08-03 15:08:54 -07:00
Zuhayr
f50256eabb Work progresses on species datums. Mass-commit due to repo issues requiring a reset. 2013-07-31 11:50:56 -07:00
Zuhayr
08ff3df905 Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools. 2013-07-29 06:43:37 -07:00
Zuhayr
8c3c26e2e8 Added cortical stacks for vox survival objective. 2013-07-29 06:36:55 -07:00
Kilakk
d7d84ff515 Added a deadchat toggle for all players.
* Both admins and regular players can toggle deadchat off
* Having deadchat on still requires you to be a ghost or an admin/mod to be able to /see/ deadchat
2013-07-27 22:54:30 -04:00
Zuhayr
d220e470ed Antag creation button landmark fix. 2013-07-27 07:53:37 -07:00
Mloc-Argent
9d2e107005 Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-25 18:30:24 +01:00
Chinsky
a344010db4 Merge pull request #3330 from Kilakk/master
Compile fix (read: I'm an idiot)
2013-07-21 18:50:12 -07:00
Kilakk
d369b9ffff Compile fix (read: I'm an idiot) 2013-07-21 19:49:30 -04:00
Chinsky
f9b6ef3593 Merge pull request #3328 from Mloc/master
Bugfixes.
2013-07-21 16:42:29 -07:00
Kilakk
e9483415d3 Fixes #3326 - uncommented admin-ERT verb 2013-07-21 19:38:32 -04:00
Mloc-Argent
f0e0951c1c Fixes #3230.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-22 00:18:24 +01:00
Zuhayr
07b9c30354 Vox raid spawn fixes. 2013-07-13 16:23:13 -07:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida"
This reverts commit a2fddc0fc1.
2013-07-12 12:22:35 +01:00
Mloc-Argent
75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Mloc-Argent
94af89d0a2 Fixes #2091
Adds missing topic() code for page selection on player notes, properly alphabeticalizes.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-06 22:16:01 +01:00
Zuhayr
9a2ce35199 Commenting out ninja mode, as it is broken. 2013-07-06 21:53:11 -07:00
Zuhayr
60b9d0f8fc Compile fix. 2013-07-05 22:09:27 -07:00
Zuhayr
b6699cbf9a Adds ammo to vox spawning with a crossbow. 2013-07-05 21:57:51 -07:00
Zuhayr
5dc40474ec Removes vox randomness in appearance. 2013-07-05 21:53:17 -07:00
Zuhayr
1e7dc9667e Vox raider class distribution fix. 2013-07-04 23:22:55 -07:00
Zuhayr
db650d3757 Config merge. 2013-07-04 14:39:46 -07:00
Mloc-Argent
cf4bd39f6e Updated the linkage between the NanoTrasen IRC bot and the server.
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-02 23:41:40 +01:00