cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,120 Commits 74 Branches 23 Tags
b315b479ade91321552f554caef31f65d2fc080b
Commit Graph

12355 Commits

Author SHA1 Message Date
Akrilla
b315b479ad Anim fix. 2016-05-19 15:06:02 +01:00
Akrilla
a0e6c3ac79 Change to usr. 2016-05-19 14:59:09 +01:00
Akrilla
cf4f6ba200 Okay, I actually fixed it this time. 2016-05-19 14:52:45 +01:00
Akrilla
570a0bee07 Bug fix. 2016-05-19 14:47:50 +01:00
Akrilla
0520ea0ebe Taking damage or attacks removes stealth. 2016-05-19 14:43:22 +01:00
skull132
79044f3597 Merge pull request #308 from Akrilla/cold-slimes 
Slimes take damage when under their cold threshold.
 2016-05-18 15:25:33 +03:00
skull132
8e675f756f Merge pull request #307 from Akrilla/necrosis-fix 
Fixes #284: Necrotic organ repair fix
 2016-05-18 15:25:08 +03:00
skull132
529a3ea6e3 Merge pull request #300 from ArcBotSS13/spectrometer-fix 
Fixes spectrometer not accepting coolant
 2016-05-18 15:21:56 +03:00
Akrilla
f2da3a0d04 Slimes take damage when under their cold threshold. 2016-05-18 13:04:08 +01:00
Akrilla
a853a3cf73 Fix for necrotic surgery. 2016-05-18 12:40:48 +01:00
skull132
5bbc831f31 Merge pull request #302 from MissBrightdawn/development 
Coffee Machine: Update 1
 2016-05-17 23:46:45 +03:00
Akrilla
35a2b6a9e9 Small change to remove the 'is' prefix from poses. 2016-05-16 15:37:41 +01:00
Akrilla
d118a83bea Fixes heartstop logic with certain chemicals, no longer flat lines. 2016-05-16 15:37:22 +01:00
Akrilla
2e422fb869 Fixes certain chemicals allowing random movement in space. 2016-05-16 15:36:50 +01:00
Brightdawn~
7740b81fbc Coffee Machine: Update 1 
This is only the beginning of the Coffee machine updates and new
recipes!
 2016-05-16 11:04:10 +01:00
ArcBot
9a11c728a8 Fixes spectrometer not accepting coolant 2016-05-15 16:37:20 -04:00
skull132
aec33074de Merge pull request #285 from LordFowl/development 
Vaurca Changes + Map Batch
 2016-05-15 21:00:17 +03:00
skull132
310fadf562 Merge pull request #298 from LordLag/master 
Changes Reroute
 2016-05-15 20:53:45 +03:00
skull132
6287b3be66 Merge pull request #253 from skull132/sql-new-fix 
Fixes #255
 2016-05-15 20:40:44 +03:00
LordFowl
9390feffef Vaurca Compatibility Patch 
Attempt to make Travis recognize my damn work.
 2016-05-05 20:39:11 -04:00
LordFowl
f85e66640b Compatibility Patch 
Modifies grown.dm, station.dm, snacks.dm, and preferences.dm to be
compatible with the latest devbuild.
 2016-05-05 20:32:40 -04:00
LordFowl
818c3a484f Fixing Preferences 
Manual fix to preferences.dm
 2016-05-05 20:08:06 -04:00
LordFowl
c7ca0887e7 Vaurca Changes 
Various vaurca-based changes, as detailed in the changelogs.
 2016-05-05 19:10:05 -04:00
Lord Lag
edbec1962f Fixes #263, #235. Tweaks ED 
Asides from two small bugfixes, adjusts Emergency Doors.
 2016-04-17 14:09:31 +01:00
skull132
61744e18e8 Aghost requires R_MOD or R_ADMIN 2016-04-02 22:30:45 +03:00
skull132
054c267d48 Merge pull request #239 from skull132/master 
Fixes #238
 2016-03-26 06:45:11 +02:00
skull132
f3ae9b6251 Fixes #238 2016-03-26 06:41:55 +02:00
skull132
68a2e3dcd9 Merge pull request #229 from Mahzel/development 
Characters database #109
 2016-03-25 23:23:19 +02:00
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
3d3dbcb8f0 JMP logs for days 
Adds JMP messages to most forms of physical attacks.
 2016-03-25 18:27:37 +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
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
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
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
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
2c4f5c42ea Merge remote-tracking branch 'Mahzel/development' into mahzel-compatibility 2016-03-24 20:25:07 +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
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