cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 20:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,232 Commits 94 Branches 23 Tags
TGSDMAPI
Commit Graph
563 Commits
Author SHA1 Message Date
Ryan784 650c34ee4c DEV Flags + Perms + Verbs 
The Dev Flag and status is back in game! As of right now, you will have
to play around with the values in regards to the defines in setup.dm
(specifically with CCIAA), but everything works fine, besides maybe Devs
having some verbs they shouldn't for some reason..

But besides that, it's peachy.
 2016-02-03 22:57:34 -05:00
skull132 8569d1c1ab +CCIAA Flag 2016-02-02 23:37:15 +02:00
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
skull132 87cdc3b247 Wind Proc And Player Panel Changes 2016-01-19 15:48:48 +02:00
skull132 9310018dbd SQL Warnings 
Adds the SQL based warning system.
 2016-01-19 00:27:50 +02:00
Ccomp5950 d34e30a915 Merge pull request #11975 from PsiOmegaDelta/160112-PublicToggle 
Adds verb to toggle hub visibility.
 2016-01-14 03:21:41 -05:00
ccomp5950 d316e34b61 Fixes deadmin popup. 
You can too re-admin yourself...I wrote that shit.
 2016-01-13 23:00:47 -05:00
PsiOmegaDelta 4f6ebf9a43 Adds a config option to automatically delist the server from the BYOND up when there are no admins. 2016-01-13 08:05:49 +01:00
NeertiandPsiOmegaDelta c3586712e5 Adds verb to toggle hub visibility. 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2016-01-12 18:02:00 +01:00
GinjaNinja32 2d5b677a62 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-12-25 03:51:40 +00:00
GinjaNinja32 7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
DatraenandPsiOmegaDelta c5912b988c Adds a paralyze button for easy administration. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:56:48 +01: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
GinjaNinja32 1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00: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
PsiOmega 63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
 2015-09-27 13:36:56 +02:00
HarpyEagle 380b89fcc0 Fixes #11130, renames aghosted var 
because it is no longer used solely for aghosting.
 2015-09-26 20:48:13 -05: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
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
PsiOmega 95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega 69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr 58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +09:30
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
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 b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 
Conflicts:
	code/game/turfs/simulated/floor_types.dm
 2015-08-22 03:57:12 +09:30
Zuhayr 56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr 3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +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
GinjaNinja32 29be304c89 Merge pull request #10640 from Karolis2011/map_capture 
Added map capture tool
 2015-08-18 02:51:56 +01:00
PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/Sleeper.dm
 2015-08-17 13:05:58 +02:00
Karolis2011 84a9fd2927 Removed ingame capture link generation and fixed some bugs. 2015-08-15 14:04:25 +03:00
Karolis2011 9ea9490332 Added map capture function. 2015-08-15 12:39:07 +03:00
PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
mwerezak cd153ad975 Aghosted mobs no longer act as SSD 
Removed player_logged var since it didn't serve it's intended purpose and replaced with aghosted var. Changed SSD checks to only look at client since regardless of what key gets set to I think we probably don't want players being told a mob is SSD if there is some client controlling it.
 2015-08-14 22:41:51 -04:00
Zuhayr 1b840a6efc More work on pods, added personnel pod. 2015-08-13 16:59:18 +09:30
Zuhayr 31ffc91d47 Added supply drops. 2015-08-13 16:59:17 +09:30
PsiOmegaDelta db565ae2ff Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery 
Conflicts:
	code/datums/datacore.dm
	code/defines/obj.dm
 2015-08-13 08:11:32 +02:00
PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
GinjaNinja32 e96ff66715 Merge remote-tracking branch 'upstream/dev' into vv 
Conflicts:
	code/modules/admin/verbs/debug.dm
 2015-08-13 05:46:16 +01:00
PsiOmegaDelta 3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta 6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
 2015-08-05 09:16:50 +02:00
GinjaNinja32 c71d78ab1a add debug verb as pAI-spawning adminverb 2015-08-05 00:50:04 +01:00
PsiOmegaDelta 93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
 2015-07-30 10:49:37 +02:00