Commit Graph

20841 Commits

Author SHA1 Message Date
skull132
f24b15fa76 Merge pull request #236 from Aurorastation/development
Development Merge - 25MAR2016
2016-03-25 22:35:35 +02:00
skull132
8b5c7bc2c5 Conflict resolution
Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt
2016-03-25 22:25:41 +02:00
skull132
8f464b84fe Fixes #187 2016-03-25 21:44:17 +02:00
skull132
17938853d5 Of Helper Procs & Dumbs
Makes a mob/proc/can_use_hand(), which determines whether or not a mob can use a given hand.

Redefined in human.dm to check a hand's status and usability.
2016-03-25 20:33:10 +02:00
skull132
4bce434a56 Fixes #184
Medical records are no longer accessible by janitors.
2016-03-25 18:44:44 +02:00
skull132
3d3dbcb8f0 JMP logs for days
Adds JMP messages to most forms of physical attacks.
2016-03-25 18:27:37 +02:00
skull132
e7e4a32266 Revert Better thralls list handling, maybe?
Attempted fix at #204. The list handling is REALLY funky and probably needs a proper refractor. But I'm too loaded with projects to deal with this atm, so bandaid fix it is.

(reverted from commit 4643217e6e)
2016-03-25 18:26:59 +02:00
skull132
4643217e6e Better thralls list handling, maybe?
Attempted fix at #204. The list handling is REALLY funky and probably needs a proper refractor. But I'm too loaded with projects to deal with this atm, so bandaid fix it is.
2016-03-25 18:10:04 +02:00
skull132
3d90716324 Reworking hand usability checks; Fixes #200
Hand usability checks are moved into `mob/living/carbon/human/put_in_l_hand()` and `put_in_r_hand()` respectively. This changes how `obj/item/attack_hand()` functions slightly.
2016-03-25 17:32:49 +02:00
skull132
3f1416e2e5 Fixes #179
Merge pull request #11121 from Dennok/patch-1
2016-03-25 16:52:49 +02:00
skull132
524a6fe26e Fixing Verbs
Adds check_ai_laws and check_rune_words to moderators.
Removes debug_variables from standard holders so we don't have aux staff doing silly things.
Removes a duplicate entry of empty_ai_core_toggle_latejoin.
2016-03-25 16:26:10 +02:00
skull132
5b147ac05b Voting Overhaul
Transfer vote delay is counted from vote end, so it doesn't conflict with invalid or cancelled votes. Or other votes.

TRANSFER_TIMEOUT added as a config option, default value is 2 hours. No transfer votes before 2 hours.

Transfer votes before 3 hour mark require 2/3rds majority to pass again. Credit to SoundScopes for the original snippet.
2016-03-25 16:09:03 +02:00
skull132
8d1de33271 Fixing Rev
No more auto-recalling shenaniganry. Let's not turn this into a giant deathmatch, alright?
2016-03-25 04:05:39 +02:00
skull132
89945c5324 Resolves #232
Mods now have check contents again.
2016-03-25 02:19:22 +02:00
skull132
cdfbf75b30 Fixes #173
Missing query attributes are awful.
2016-03-25 02:10:49 +02:00
skull132
5a55c1370b Processor status text clarification
Simple enough: the higher the number, the worse the situation.
2016-03-25 02:08:08 +02:00
skull132
0a93920b54 Fixes #199
No more cuffing people from tiles away.
2016-03-25 01:56:29 +02:00
skull132
df8f0bbc68 Resolves #211
Mods can now into votes.
2016-03-25 01:50:39 +02:00
skull132
31d7dedbf7 Fixes #223
No more infinite plasmacutters, please.
2016-03-25 01:50:19 +02:00
skull132
3cf3840c53 Fixes #207
Hardsuit items that would require actual space to be utilized, like weapons, can no longer be used inside mechs. May be modified later to include other conditions, such as being inside lockers or whatever.
2016-03-25 01:29:14 +02:00
skull132
d22d80a159 Sleeper & Bodyscan Density Fix
They can now be walked through.
2016-03-25 00:52:23 +02:00
skull132
74443f8ccc Fixes #215
You can no longer drag people into various objects as a ghost.
2016-03-25 00:50:29 +02:00
skull132
a5ec3439f6 Merge pull request #230 from skull132/webinterface-integration
Webinterface integration - Patch 1
2016-03-25 00:37:09 +02:00
skull132
c709b8b927 Fixing contract uplink spawn 2016-03-25 00:27:01 +02:00
skull132
71b7758248 Merge pull request #228 from skull132/webinterface-integration
Webinterface integration
2016-03-24 20:49:18 +02:00
skull132
4be6656e96 Compatibility patch
Replaces instances of establish_db_connection() with establish_db_connection(dbcon).
2016-03-24 20:34:45 +02:00
skull132
c030c62807 More reworking of DB handling
sqllogging depracted in favour of config.sql_enabled. Database loading is done through /hook/startup/proc/load_databases, with initialize_database_object() being a generalized proc to read any generic database config file. (TODO: config examples in relaiton to last remark.)
2016-03-24 20:29:40 +02:00
skull132
20c3e7768e Generalizing establish_db_connection() and setup_database_connection()
Both procs are now generalized, and accept a DBConnection object as an argument. Due to this generalization, all instances of `establish_db_connection()` must be renamed to `establish_db_connection(dbcon)`.
Also added variable `failed_connections` to the definition of DBConnection.
2016-03-24 20:29:01 +02:00
skull132
f7308f94ad DBConnection object modifications
Renames the variables of the DBConnection object to make differentiating them easier.
Reworks the `DBConnection/New()` and `Connect()` methods to allow for the automatic creation of the dbi handler string. Adds a con_database variable to DBConnection to enable this. DBConnection objects now also house the current database they're using for this purpose.
Moves the constructor for dbcon under `/hook/startup/proc/connectDB()`, as it needs to be called after the SQL config has been read by `datum/global_init/New()`
2016-03-24 20:28:33 +02:00
skull132
db5bdb622a Remove forumdb
Unused object and vars. Cleans them up, as well as removes the config file.
2016-03-24 20:28:06 +02:00
skull132
2c4f5c42ea Merge remote-tracking branch 'Mahzel/development' into mahzel-compatibility 2016-03-24 20:25:07 +02:00
skull132
6100701844 Contract Uplink Fix
The uplink is now spawned per raider, instead of being on the map. can't have it on the map as its init causes issues.
2016-03-24 02:08:05 +02:00
skull132
899f8cdbec contract_uplink device & data parsing fix
A contract_uplink device has been added, for rounds where no TCs are to be given to antags, but access to the database is neat. Namely: heist.

The blacklist was removed, the issue proved to be carriage return characters breaking nanoUI. They are now removed.
2016-03-24 01:26:36 +02:00
Mahzel
3b383ad315 #109 update
moved variables inside preferences datum
switched gear to the list2params trick (cleaner, faster, easier)
enabled intial character file system
2016-03-23 18:04:52 +01:00
Mahzel
9de0a7e04a Characters continued
Alt_titles finally added
Gear bug at first insertion corrected
2016-03-22 23:42:45 +01:00
skull132
7e266649ea Syndicate Contracts - Initial Implementation
Adds SQL database based syndicate contracts to be viewed from any uplink. These can be used as IC traitor objectives, but hopefully with more RP and stuff.
2016-03-21 23:07:04 +02:00
skull132
a5cb959166 Remove config.webint_enabled
Depracted in favour of using config.webint_url in general. Just checks if it's defined, and if so, we'll consider it active and in use.
2016-03-21 23:06:02 +02:00
skull132
e03eaa86a5 client procs.dm - sso_server addition
Adds a new route for the webint url parser. Also reverts to checking for config.webint_url as opposed to running double checks for config.webint_enabled and then for the url. If the URL is present, we're enabling the webint.
2016-03-21 23:05:31 +02:00
skull132
997665bca7 webint_procs.dm - webint_start_singlesignon()
Proc for creating a unique signin token for the website and shoving it into the database.
2016-03-21 23:04:10 +02:00
Lord Lag
b294a52dcc Fixes 120
replaces the temperature gun with the old-fashioned Freeze ray.
2016-03-20 14:52:11 +00:00
Mahzel
ad7bbb25bc Characters DB R3
Corrected a bug when creating a new character
Corrected gear management issues (SQL is so annoyed by NULL things :( )
Corrected a slot detection issue
2016-03-18 23:48:50 +01:00
Mahzel
2f4c772d8c Debugging SQL characters
Fixed runtime errors while loading the game
Fixed runtime errors while changing characters
Fixed gear not being updated correctly.
2016-03-16 22:40:47 +01:00
Mahzel
14370d36b6 characters db continued
This one's not bad, but we need to think about how to integrate to the
main system. Dual save?
2016-03-15 23:51:35 +01:00
skull132
6bb74a7a87 dbcore.dm - Better INT Management
`parseArguments()` will now identify 0 as an itneger properly, instead of slotting it under null.
2016-03-14 19:24:49 +02:00
Lord Lag
5b3c0efa29 Fixes #210 2016-03-10 19:59:52 +00:00
Talkarcabbage
c5803ea64f Made water-coolers wrenchable. 2016-03-10 02:38:43 -06:00
skull132
8ae5c4d3bf Merge pull request #219 from skull132/master
Sorting Forms by ID
2016-03-10 00:16:33 +02:00
skull132
000192c18e Sorting Forms by ID 2016-03-10 00:11:26 +02:00
skull132
033cb6b7a5 Merge pull request #218 from skull132/master
Fixes #180, #214
2016-03-09 22:49:59 +02:00
skull132
3f7f3f2b89 Fixes #214
Conversion now ignores roles whenever trying to make new cultists. This means that sec officers and whoever can be converted once more.
2016-03-09 22:30:25 +02:00