cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,200 Commits 94 Branches 23 Tags
workflow
Commit Graph
1192 Commits
Author SHA1 Message Date
skull132 179431115b Merge remote-tracking branch 'Aurorastation/development' into SQL-backend-import 
# Conflicts:
#	code/modules/admin/admin.dm
#	code/modules/admin/admin_verbs.dm

All conflicts cleared. Wind funciton needs a quick redo as a result.
 2016-02-01 16:00:54 +02:00
Chinsky 4143352d48 Merge pull request #12005 from PsiOmegaDelta/160118-MoveMe 
Adds the moved event.
 2016-01-21 07:24:37 +03:00
skull132 5da7e3d699 Player Notes SQL 
Adds the SQL based notes system. Partially refractored to use the new DB procs and look neater.
 2016-01-19 14:55:01 +02:00
Atlantis 9b099a307b Tweaks 
- Landmark on supermatter core now waits until all other landmarks are done setting up.
- Setup-supermatter proc is now defined on /datum/admins/ rather than on /client/
- Coolant canisters now have double amount of standard canister's worth of gas, as intended, instead of triple.
 2016-01-19 11:02:42 +01:00
Atlantis 85ceb32bca Overhauls setup-supermatter admin verb 
- Setup supermatter now uses series of map markers to do it's thing. These makers will make it easier to keep it up to date with map changes.
- Setup supermatter now supports CO2 and PH coolant choices.
- Fixes #9661
 2016-01-19 08:20:44 +01:00
skull132 9310018dbd SQL Warnings 
Adds the SQL based warning system.
 2016-01-19 00:27:50 +02:00
PsiOmegaDelta 1210a6e42f Adds the moved event. 
Allows movable atoms to follow other movable atoms, as quickly as BYOND allows. Also supports following atoms inside other atoms.
However, this only works fully when Move() or forceMove() is utilized. Setting loc directly will not raise the moved event.
 2016-01-18 20:16:48 +01:00
skull132 c7ae4df416 dbcon_old removal, table prefixing 
Prefixes the tables properly with ss13_, and removes active references to dbcon_old and related procs.
 2016-01-13 15:59:36 +02:00
PsiOmegaDelta 12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
 2015-12-13 10:47:33 +01:00
PsiOmegaDelta f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
SkyMarshal d10118e3d0 Fixes #11346 
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
 2015-12-12 12:03:15 -07:00
SkyMarshal eae12b8f9c Fixes #8568 2015-12-11 19:52:18 -07:00
GinjaNinja32 1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
BlueNexus e071ac7358 Added holder to the locked vars list 
I'm very surprised a security loophole like this wasn't noted earlier.
 2015-12-07 12:07:08 +00:00
Zuhayr a56618119a Merge pull request #11502 from PsiOmegaDelta/151121-InWorldParams 
Replaces 'in world' arguments.
 2015-12-02 09:56:28 +10:30
PsiOmegaDelta a7dc586e72 Merge pull request #11549 from Baystation12/dev-freeze 
Dev
 2015-12-01 08:19:19 +01:00
PsiOmegaDelta 5a0d76d876 Merge pull request #11548 from Baystation12/master 
Dev-freeze
 2015-12-01 08:09:15 +01:00
PsiOmegaDelta 2d5677109f Build mode throws now admin logs. 
Fixes #11514.
 2015-11-29 12:14:31 +01:00
PsiOmegaDelta 6e69442545 Replaces 'in world' arguments. 
Arguments acquired from 'in world' cannot be GCd for several minutes due to a hidden reference from usr to the argument itself.
This replaces all 'in world' arguments with 'in range(world.view)', with the notable exception of "View Variables".
 2015-11-21 11:06:08 +01:00
Zuhayr 5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs 
Xenomorph update
 2015-10-13 08:31:27 +10:30
PsiOmegaDelta 27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
GinjaNinja32 d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
HarpyEagle 63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
Zuhayr 22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30
PsiOmega 5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-09-15 20:31:59 +02:00
PsiOmega 5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
Kelenius 9dd6f9762a Resolves #11049 2015-09-14 12:05:28 +03:00
GinjaNinja32 be2279106f Merge remote-tracking branch 'upstream/dev' into vv 
Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/admin/view_variables/topic.dm
 2015-09-10 03:06:27 +01:00
PsiOmegaDelta 94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta 2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
 2015-09-08 07:58:25 +02:00
Zuhayr 211e426009 Tweak. 2015-09-07 14:43:20 +09:30
Zuhayr 0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Chinsky a3b3e52959 Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir 2015-09-02 04:38:26 +03:00
PsiOmega 35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00
PsiOmega ff7a4fc244 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/events/event_container.dm
 2015-08-28 11:18:57 +02:00
PsiOmega f68275d91b Improved admin logging. 
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
 2015-08-27 20:20:20 +02:00
PsiOmegaDelta bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
Zuhayr b7c95f9c00 Merge pull request #10880 from Baystation12/dev-freeze 
Dev freeze
 2015-08-26 03:22:06 +09:30
Zuhayr f4d27e8b1c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/admin/verbs/adminsay.dm
 2015-08-26 03:09:11 +09:30
PsiOmega 949cfdfc5b Restores special admin color in Msay 
Restores the special appearance admin name's had when using MSAY, to differentiate them from the masses.
 2015-08-25 19:06:52 +02:00
mwerezak 09f1c6054b Changed MSAY to show the ckey/character name like it does with asay 2015-08-23 20:27:56 -04:00
MrSnapwalk d45d46f920 Resprites, renames, and repaths the detective uniforms. 2015-08-22 19:43:28 -05:00
PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
 2015-08-21 20:27:48 +02:00
Zuhayr 3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmegaDelta a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02:00
Zuhayr c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
Zuhayr a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
Zuhayr a896991657 Even comments need matching spans for Travis to pass. 2015-08-18 11:55:43 -07:00