Commit Graph

2132 Commits

Author SHA1 Message Date
Datraen
0b4ed44ce4 Fixes admin verb, also adds changelog. 2015-12-22 15:09:28 -05:00
Datraen
f9c6c0549e Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 2015-12-20 14:38:10 -05:00
Datraen
d2eba4610f Adds a paralyze button for easy administration. 2015-12-20 14:20:09 -05: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
Neerti
64a5290711 Adds set_tcrystals() to hidden adminverb list.
As requested by Datraen.
2015-12-12 19:38:41 -05: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
Neerti
aa2285cfb5 Fixes admin check in new set_telecrystal proc. 2015-12-12 10:56:06 -05:00
SkyMarshal
eae12b8f9c Fixes #8568 2015-12-11 19:52:18 -07:00
Datraen
ef0337fccf Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels. 2015-12-11 21:14:11 -05:00
HarpyEagle
a9d3f02cd5 Updates preset TTV bombs, adds debug verb 2015-12-08 18:15:55 +01:00
PsiOmegaDelta
5a0d76d876 Merge pull request #11548 from Baystation12/master
Dev-freeze
2015-12-01 08:09:15 +01:00
Datraen
1886eaa066 Lets mods see and toggle attack logs. 2015-12-01 01:07:45 -05:00
Datraen
6f6cb4661f Merge branch 'master' into Devtweaks 2015-11-29 22:36:08 -05:00
Datraen
3506e0861c Fixes jumping, adds dev access to msay and ahelps. 2015-11-29 22:34:00 -05:00
Neerti
75c574eddd Adds verb to toggle hub visibility. 2015-11-29 22:06:05 -05:00
SinTwo
8d747eed8d Moderator Logs 2015-11-29 13:34:00 -05:00
PsiOmegaDelta
2d5677109f Build mode throws now admin logs.
Fixes #11514.
2015-11-29 12:14:31 +01:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05: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
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
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