cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 16:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,875 Commits 74 Branches 23 Tags
afd526126d8f4d4e36a42b51fa9cfbc6bea18f14
Commit Graph

1735 Commits

Author SHA1 Message Date
Mustafa Kalash
82e793ae91 Fixes #11783 2016-01-01 15:52:35 -05:00
GinjaNinja32
d309e9e98f fix #11828 2015-12-30 18:46:25 +00:00
GinjaNinja32
31c41f39b3 make VV list format clearer for assoc lists 2015-12-29 07:38:05 +00: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
PsiOmegaDelta
70b84d87a6 Tweaks permission rights. 2015-12-23 13:01:03 +01:00
Datraen
65f68602e7 Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:57:43 +01:00
Datraen
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
PsiOmegaDelta
6f75954863 Merge pull request #11678 from SkyMarshal/newscaster-silliness 
Admin created newscaster channels now function correctly.
 2015-12-12 22:51:48 +01:00
SkyMarshal
f9af885ee1 Admin created newscaster channels now function correctly. 
Fixes #8326
 2015-12-12 14:32:22 -07: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
GinjaNinja32
98c8729bb3 Merge pull request #11265 from Karolis2011/camera_fix 
General camera fixes.
 2015-11-23 09:29:02 +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
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
Chinsky
0c474bc5a5 Merge pull request #11281 from mwerezak/autoantag 
Cleans up antag auto-spawning, adds checks for active antags
 2015-10-15 19:16:13 +03:00
Chinsky
8c8b5a34d3 Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob 
Blob spawn locations are now more random
 2015-10-14 03:24:28 +03:00
PsiOmegaDelta
d7b6784e28 Fixes law change logging. 
The "Show last X law changes" review window should now actually be useful, displaying AI law updates with time, user, and law change.
 2015-10-13 19:44:49 +02:00
PsiOmegaDelta
3b5990121f Blobs locations are now more random. 
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.

Space vines and nuclear discs have been updated to use the same mechanics.
 2015-10-13 18:49:55 +02:00
Zuhayr
5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs 
Xenomorph update
 2015-10-13 08:31:27 +10:30
HarpyEagle
241520f0bb Cleans up autospawn, now uses existing code for selecting and choosing 
candidates. Adds more debug messages, and removes unused code.
 2015-10-12 13:03:50 -04:00
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
PsiOmegaDelta
13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
 2015-10-10 12:05:36 +02:00
GinjaNinja32
d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
Karolis2011
414c160b9f Removed code copy paste and fixed light not showing up on images. 2015-10-10 02:58:50 +03:00
HarpyEagle
63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
GinjaNinja32
1f1857cc0a Merge pull request #11257 from Karolis2011/map_capture 
Added more help/error messages to the capture tool.
 2015-10-09 11:35:54 +01:00
Karolis2011
fad0e0b28a Added more help/error messages to the tool. 2015-10-08 12:36:09 +03:00
PsiOmegaDelta
8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	baystation12.dme
 2015-10-01 09:48:51 +02: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
PsiOmega
709840f848 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/DB ban/functions.dm
 2015-09-26 08:48:37 +02:00
PsiOmega
145d8d91ef Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/_helpers/unsorted.dm
 2015-09-26 08:43:06 +02:00
PsiOmegaDelta
509486dbd9 Merge pull request #11181 from GinjaNinja32/crash_with 
Add proc/crash_with, fix two incorrect qdel calls
 2015-09-25 06:31:38 +02:00
GinjaNinja32
8ed4faf7b2 Add proc/crash_with, fix two incorrect qdel calls 2015-09-23 13:29:54 +01:00
GinjaNinja32
9be47c6374 Permabans do not expire, and we don't need to show expired when it's been manually lifted 2015-09-23 13:03:11 +01:00
GinjaNinja32
c707519d1f Add specific color for expired bans in ban panel, fix some formatting and a runtime 2015-09-23 12:58:39 +01:00
Zuhayr
22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30
PsiOmegaDelta
7ce27f76fd Macro refactoring. 
Turns several of the is* procs into istype defines.
 2015-09-16 12:57:14 +02:00